mercurial-crew-with-dirclash: hgext/mq.py annotate

annotate hgext/mq.py @ 4430:94cb7561337d

Fix test-patchbomb for crew

author	Brendan Cully <brendan@kublai.com>
date	Tue, 08 May 2007 13:08:20 -0700
parents	28b7d949ef6a 0532491f7476
children	905397be7688

rev	line source
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1 # queue.py - patch queues for mercurial
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2 #
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2855 diff changeset	3 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	4 #
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	5 # This software may be used and distributed according to the terms
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	7
2554 8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	8 '''patch management and development
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
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	11 repository. It manages two stacks of patches - all known patches, and
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
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	15 directory. Applied patches are both patch files and changesets.
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	16
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	17 Common tasks (use "hg help command" for more details):
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	18
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	19 prepare repository to work with patches qinit
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	20 create new patch qnew
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	21 import existing patch qimport
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	22
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	23 print patch series qseries
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	24 print applied patches qapplied
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	25 print name of top applied patch qtop
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	26
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	27 add known patch to applied stack qpush
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	28 remove patch from applied stack qpop
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	29 refresh contents of top applied patch qrefresh
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	30 '''
8264c2034970 help: add help to mq extension Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2531 diff changeset	31
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3886 diff changeset	32 from mercurial.i18n import _
3886 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3874 diff changeset	33 from mercurial import commands, cmdutil, hg, patch, revlog, util, changegroup
3963 ba45041827a2 remove various unused import Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3902 diff changeset	34 import os, sys, re, errno
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	35
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	36 commands.norepo += " qclone qversion"
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	37
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	38 # 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	39 # 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	40 normname = util.normpath
bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	41
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	42 class statusentry:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	43 def __init__(self, rev, name=None):
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	44 if not name:
3088 7fa3d38a99b6 mq: handle patch names containing ":" Brendan Cully <brendan@kublai.com> parents: 3085 diff changeset	45 fields = rev.split(':', 1)
2805 52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	46 if len(fields) == 2:
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	47 self.rev, self.name = fields
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	48 else:
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	49 self.rev, self.name = None, None
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	50 else:
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	51 self.rev, self.name = rev, name
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	52
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	53 def __str__(self):
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	54 return self.rev + ':' + self.name
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	55
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	56 class queue:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	57 def __init__(self, ui, path, patchdir=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	58 self.basepath = path
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	59 self.path = patchdir or os.path.join(path, "patches")
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	60 self.opener = util.opener(self.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	61 self.ui = ui
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	62 self.applied = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	63 self.full_series = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	64 self.applied_dirty = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	65 self.series_dirty = 0
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	66 self.series_path = "series"
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	67 self.status_path = "status"
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	68 self.guards_path = "guards"
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	69 self.active_guards = None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	70 self.guards_dirty = False
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	71 self._diffopts = None
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	72
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	73 if os.path.exists(self.join(self.series_path)):
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	74 self.full_series = self.opener(self.series_path).read().splitlines()
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	75 self.parse_series()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	76
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	77 if os.path.exists(self.join(self.status_path)):
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	78 lines = self.opener(self.status_path).read().splitlines()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	79 self.applied = [statusentry(l) for l in lines]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	80
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	81 def diffopts(self):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	82 if self._diffopts is None:
2908 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2882 diff changeset	83 self._diffopts = patch.diffopts(self.ui)
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	84 return self._diffopts
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	85
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	86 def join(self, *p):
766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	87 return os.path.join(self.path, *p)
766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	88
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	89 def find_series(self, patch):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	90 pre = re.compile("(\s*)([^#]+)")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	91 index = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	92 for l in self.full_series:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	93 m = pre.match(l)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	94 if m:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	95 s = m.group(2)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	96 s = s.rstrip()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	97 if s == patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	98 return index
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	99 index += 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	100 return None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	101
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	102 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: 2808 diff changeset	103
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	104 def parse_series(self):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	105 self.series = []
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	106 self.series_guards = []
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	107 for l in self.full_series:
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	108 h = l.find('#')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	109 if h == -1:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	110 patch = l
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	111 comment = ''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	112 elif h == 0:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	113 continue
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	114 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	115 patch = l[:h]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	116 comment = l[h:]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	117 patch = patch.strip()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	118 if patch:
3177 87b7ae306d54 mq: bail out if a patch appears more than once in the series file. Brendan Cully <brendan@kublai.com> parents: 3176 diff changeset	119 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: 3176 diff changeset	120 raise util.Abort(_('%s appears more than once in %s') %
87b7ae306d54 mq: bail out if a patch appears more than once in the series file. Brendan Cully <brendan@kublai.com> parents: 3176 diff changeset	121 (patch, self.join(self.series_path)))
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	122 self.series.append(patch)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	123 self.series_guards.append(self.guard_re.findall(comment))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	124
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	125 def check_guard(self, guard):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	126 bad_chars = '# \t\r\n\f'
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	127 first = guard[0]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	128 for c in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	129 if first == c:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	130 return (_('guard %r starts with invalid character: %r') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	131 (guard, c))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	132 for c in bad_chars:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	133 if c in guard:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	134 return _('invalid character in guard %r: %r') % (guard, c)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	135
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	136 def set_active(self, guards):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	137 for guard in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	138 bad = self.check_guard(guard)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	139 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	140 raise util.Abort(bad)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	141 guards = dict.fromkeys(guards).keys()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	142 guards.sort()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	143 self.ui.debug('active guards: %s\n' % ' '.join(guards))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	144 self.active_guards = guards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	145 self.guards_dirty = True
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	146
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	147 def active(self):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	148 if self.active_guards is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	149 self.active_guards = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	150 try:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	151 guards = self.opener(self.guards_path).read().split()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	152 except IOError, err:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	153 if err.errno != errno.ENOENT: raise
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	154 guards = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	155 for i, guard in enumerate(guards):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	156 bad = self.check_guard(guard)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	157 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	158 self.ui.warn('%s:%d: %s\n' %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	159 (self.join(self.guards_path), i + 1, bad))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	160 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	161 self.active_guards.append(guard)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	162 return self.active_guards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	163
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	164 def set_guards(self, idx, guards):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	165 for g in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	166 if len(g) < 2:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	167 raise util.Abort(_('guard %r too short') % g)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	168 if g[0] not in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	169 raise util.Abort(_('guard %r starts with invalid char') % g)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	170 bad = self.check_guard(g[1:])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	171 if bad:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	172 raise util.Abort(bad)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	173 drop = self.guard_re.sub('', self.full_series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	174 self.full_series[idx] = drop + ''.join([' #' + g for g in guards])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	175 self.parse_series()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	176 self.series_dirty = True
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	177
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	178 def pushable(self, idx):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	179 if isinstance(idx, str):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	180 idx = self.series.index(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	181 patchguards = self.series_guards[idx]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	182 if not patchguards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	183 return True, None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	184 default = False
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	185 guards = self.active()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	186 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: 2808 diff changeset	187 if exactneg:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	188 return False, exactneg[0]
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	189 pos = [g for g in patchguards if g[0] == '+']
2838 851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2836 diff changeset	190 exactpos = [g for g in pos if g[1:] in guards]
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	191 if pos:
2838 851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2836 diff changeset	192 if exactpos:
851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2836 diff changeset	193 return True, exactpos[0]
851b07ec450c mq: apply patch is any posative guard matches Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2836 diff changeset	194 return False, pos
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	195 return True, ''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	196
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	197 def explain_pushable(self, idx, all_patches=False):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	198 write = all_patches and self.ui.write or self.ui.warn
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	199 if all_patches or self.ui.verbose:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	200 if isinstance(idx, str):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	201 idx = self.series.index(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	202 pushable, why = self.pushable(idx)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	203 if all_patches and pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	204 if why is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	205 write(_('allowing %s - no guards in effect\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	206 self.series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	207 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	208 if not why:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	209 write(_('allowing %s - no matching negative guards\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	210 self.series[idx])
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	211 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	212 write(_('allowing %s - guarded by %r\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	213 (self.series[idx], why))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	214 if not pushable:
2818 05316bb57d01 mq: make guards more strict, add tests Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2817 diff changeset	215 if why:
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	216 write(_('skipping %s - guarded by %r\n') %
3870 22d18051f9e5 mq: fix explain_pushable for negative guards Brendan Cully <brendan@kublai.com> parents: 3857 diff changeset	217 (self.series[idx], why))
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	218 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	219 write(_('skipping %s - no matching guards\n') %
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	220 self.series[idx])
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	221
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	222 def save_dirty(self):
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	223 def write_list(items, path):
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	224 fp = self.opener(path, 'w')
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	225 for i in items:
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	226 print >> fp, i
4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	227 fp.close()
2776 ae726521717c merge with brendan. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2775 2774 diff changeset	228 if self.applied_dirty: write_list(map(str, self.applied), self.status_path)
2772 4720e79486d3 mq: simplify save_dirty Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2771 diff changeset	229 if self.series_dirty: write_list(self.full_series, self.series_path)
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	230 if self.guards_dirty: write_list(self.active_guards, self.guards_path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	231
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	232 def readheaders(self, patch):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	233 def eatdiff(lines):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	234 while lines:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	235 l = lines[-1]
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	236 if (l.startswith("diff -") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	237 l.startswith("Index:") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	238 l.startswith("===========")):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	239 del lines[-1]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	240 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	241 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	242 def eatempty(lines):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	243 while lines:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	244 l = lines[-1]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	245 if re.match('\s*$', l):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	246 del lines[-1]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	247 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	248 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	249
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	250 pf = self.join(patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	251 message = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	252 comments = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	253 user = None
2299 dacf718e1d48 Add timestamp field to export format. Make import and mq use it. Danek Duvall <danek.duvall@sun.com> parents: 2270 diff changeset	254 date = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	255 format = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	256 subject = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	257 diffstart = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	258
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	259 for line in file(pf):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	260 line = line.rstrip()
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	261 if line.startswith('diff --git'):
2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	262 diffstart = 2
2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	263 break
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	264 if diffstart:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	265 if line.startswith('+++ '):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	266 diffstart = 2
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	267 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	268 if line.startswith("--- "):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	269 diffstart = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	270 continue
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	271 elif format == "hgpatch":
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	272 # parse values when importing the result of an hg export
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	273 if line.startswith("# User "):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	274 user = line[7:]
2300 52b9b6751b2c Use "# Date" instead of "# Timestamp" for dated export/import of patches. Thomas Arendsen Hein <thomas@intevation.de> parents: 2299 diff changeset	275 elif line.startswith("# Date "):
52b9b6751b2c Use "# Date" instead of "# Timestamp" for dated export/import of patches. Thomas Arendsen Hein <thomas@intevation.de> parents: 2299 diff changeset	276 date = line[7:]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	277 elif not line.startswith("# ") and line:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	278 message.append(line)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	279 format = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	280 elif line == '# HG changeset patch':
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	281 format = "hgpatch"
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	282 elif (format != "tagdone" and (line.startswith("Subject: ") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	283 line.startswith("subject: "))):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	284 subject = line[9:]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	285 format = "tag"
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	286 elif (format != "tagdone" and (line.startswith("From: ") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	287 line.startswith("from: "))):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	288 user = line[6:]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	289 format = "tag"
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	290 elif format == "tag" and line == "":
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	291 # when looking for tags (subject: from: etc) they
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	292 # end once you find a blank line in the source
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	293 format = "tagdone"
2301 7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2300 diff changeset	294 elif message or line:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	295 message.append(line)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	296 comments.append(line)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	297
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	298 eatdiff(message)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	299 eatdiff(comments)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	300 eatempty(message)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	301 eatempty(comments)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	302
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	303 # make sure message isn't empty
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	304 if format and format.startswith("tag") and subject:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	305 message.insert(0, "")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	306 message.insert(0, subject)
2299 dacf718e1d48 Add timestamp field to export format. Make import and mq use it. Danek Duvall <danek.duvall@sun.com> parents: 2270 diff changeset	307 return (message, comments, user, date, diffstart > 1)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	308
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	309 def removeundo(self, repo):
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	310 undo = repo.sjoin('undo')
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	311 if not os.path.exists(undo):
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	312 return
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	313 try:
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	314 os.unlink(undo)
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	315 except OSError, inst:
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	316 self.ui.warn('error removing undo: %s\n' % str(inst))
b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	317
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	318 def printdiff(self, repo, node1, node2=None, files=None,
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	319 fp=None, changes=None, opts={}):
9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	320 fns, matchfn, anypats = cmdutil.matchpats(repo, files, opts)
9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	321
9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	322 patch.diff(repo, node1, node2, fns, match=matchfn,
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	323 fp=fp, changes=changes, opts=self.diffopts())
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	324
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	325 def mergeone(self, repo, mergeq, head, patch, rev, wlock):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	326 # first try just applying the patch
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	327 (err, n) = self.apply(repo, [ patch ], update_status=False,
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	328 strict=True, merge=rev, wlock=wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	329
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	330 if err == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	331 return (err, n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	332
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	333 if n is None:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	334 raise util.Abort(_("apply failed for patch %s") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	335
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	336 self.ui.warn("patch didn't work out, merging %s\n" % patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	337
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	338 # apply failed, strip away that rev and merge.
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2804 diff changeset	339 hg.clean(repo, head, wlock=wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	340 self.strip(repo, n, update=False, backup='strip', wlock=wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	341
3980 e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	342 ctx = repo.changectx(rev)
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2804 diff changeset	343 ret = hg.merge(repo, rev, wlock=wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	344 if ret:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	345 raise util.Abort(_("update returned %d") % ret)
3980 e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	346 n = repo.commit(None, ctx.description(), ctx.user(),
e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	347 force=1, wlock=wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	348 if n == None:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	349 raise util.Abort(_("repo commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	350 try:
2299 dacf718e1d48 Add timestamp field to export format. Make import and mq use it. Danek Duvall <danek.duvall@sun.com> parents: 2270 diff changeset	351 message, comments, user, date, patchfound = mergeq.readheaders(patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	352 except:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	353 raise util.Abort(_("unable to read %s") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	354
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	355 patchf = self.opener(patch, "w")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	356 if comments:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	357 comments = "\n".join(comments) + '\n\n'
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	358 patchf.write(comments)
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	359 self.printdiff(repo, head, n, fp=patchf)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	360 patchf.close()
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	361 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	362 return (0, n)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	363
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	364 def qparents(self, repo, rev=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	365 if rev is None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	366 (p1, p2) = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	367 if p2 == revlog.nullid:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	368 return p1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	369 if len(self.applied) == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	370 return None
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	371 return revlog.bin(self.applied[-1].rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	372 pp = repo.changelog.parents(rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	373 if pp[1] != revlog.nullid:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	374 arevs = [ x.rev for x in self.applied ]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	375 p0 = revlog.hex(pp[0])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	376 p1 = revlog.hex(pp[1])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	377 if p0 in arevs:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	378 return pp[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	379 if p1 in arevs:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	380 return pp[1]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	381 return pp[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	382
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	383 def mergepatch(self, repo, mergeq, series, wlock):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	384 if len(self.applied) == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	385 # each of the patches merged in will have two parents. This
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	386 # can confuse the qrefresh, qdiff, and strip code because it
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	387 # needs to know which parent is actually in the patch queue.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	388 # so, we insert a merge marker with only one parent. This way
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	389 # the first patch in the queue is never a merge patch
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	390 #
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	391 pname = ".hg.patches.merge.marker"
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	392 n = repo.commit(None, '[mq]: merge marker', user=None, force=1,
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	393 wlock=wlock)
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	394 self.removeundo(repo)
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	395 self.applied.append(statusentry(revlog.hex(n), pname))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	396 self.applied_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	397
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	398 head = self.qparents(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	399
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	400 for patch in series:
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	401 patch = mergeq.lookup(patch, strict=True)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	402 if not patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	403 self.ui.warn("patch %s does not exist\n" % patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	404 return (1, None)
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	405 pushable, reason = self.pushable(patch)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	406 if not pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	407 self.explain_pushable(patch, all_patches=True)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	408 continue
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	409 info = mergeq.isapplied(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	410 if not info:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	411 self.ui.warn("patch %s is not applied\n" % patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	412 return (1, None)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	413 rev = revlog.bin(info[1])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	414 (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	415 if head:
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	416 self.applied.append(statusentry(revlog.hex(head), patch))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	417 self.applied_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	418 if err:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	419 return (err, head)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	420 return (0, head)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	421
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	422 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	423 '''Apply patchfile to the working directory.
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	424 patchfile: file name of patch'''
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3373 diff changeset	425 files = {}
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	426 try:
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3373 diff changeset	427 fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root,
2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3373 diff changeset	428 files=files)
2907 b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2890 diff changeset	429 except Exception, inst:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2890 diff changeset	430 self.ui.note(str(inst) + '\n')
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2890 diff changeset	431 if not self.ui.verbose:
b70740aefa4d Unify mq and hg patch invocation. Brendan Cully <brendan@kublai.com> parents: 2890 diff changeset	432 self.ui.warn("patch failed, unable to continue (try -v)\n")
3460 2d35a8d2b32d patch: return list of modified files even when an exception is raised Brendan Cully <brendan@kublai.com> parents: 3373 diff changeset	433 return (False, files, False)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	434
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	435 return (True, files, fuzz)
2791 4c39568007f9 mq: codingstyle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2790 diff changeset	436
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	437 def apply(self, repo, series, list=False, update_status=True,
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	438 strict=False, patchdir=None, merge=None, wlock=None,
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	439 all_files={}):
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	440 tr = repo.transaction()
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	441 try:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	442 ret = self._apply(tr, repo, series, list, update_status,
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	443 strict, patchdir, merge, wlock,
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	444 all_files=all_files)
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	445 tr.close()
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	446 self.save_dirty()
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	447 return ret
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	448 except:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	449 try:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	450 tr.abort()
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	451 finally:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	452 repo.reload()
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	453 repo.wreload()
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	454 raise
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	455
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	456 def _apply(self, tr, repo, series, list=False, update_status=True,
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	457 strict=False, patchdir=None, merge=None, wlock=None,
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	458 all_files={}):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	459 # TODO unify with commands.py
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	460 if not patchdir:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	461 patchdir = self.path
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	462 err = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	463 if not wlock:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	464 wlock = repo.wlock()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	465 lock = repo.lock()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	466 n = None
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	467 for patchname in series:
2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	468 pushable, reason = self.pushable(patchname)
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	469 if not pushable:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	470 self.explain_pushable(patchname, all_patches=True)
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	471 continue
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	472 self.ui.warn("applying %s\n" % patchname)
2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	473 pf = os.path.join(patchdir, patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	474
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	475 try:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	476 message, comments, user, date, patchfound = self.readheaders(patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	477 except:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	478 self.ui.warn("Unable to read %s\n" % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	479 err = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	480 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	481
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	482 if not message:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	483 message = "imported patch %s\n" % patchname
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	484 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	485 if list:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	486 message.append("\nimported patch %s" % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	487 message = '\n'.join(message)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	488
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	489 (patcherr, files, fuzz) = self.patch(repo, pf)
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	490 all_files.update(files)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	491 patcherr = not patcherr
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	492
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	493 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	494 # 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	495 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	496 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	497 for f in files:
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	498 if os.path.exists(repo.dirstate.wjoin(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	499 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	500 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	501 removed.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	502 repo.dirstate.update(repo.dirstate.filterfiles(removed), 'r')
4e5e1638b165 mq: don't abort when merging a patch that removes files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4242 diff changeset	503 repo.dirstate.update(repo.dirstate.filterfiles(merged), 'm')
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	504 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	505 repo.dirstate.setparents(p1, merge)
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	506 files = patch.updatedir(self.ui, repo, files, wlock=wlock)
2299 dacf718e1d48 Add timestamp field to export format. Make import and mq use it. Danek Duvall <danek.duvall@sun.com> parents: 2270 diff changeset	507 n = repo.commit(files, message, user, date, force=1, lock=lock,
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	508 wlock=wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	509
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	510 if n == None:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	511 raise util.Abort(_("repo commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	512
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	513 if update_status:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	514 self.applied.append(statusentry(revlog.hex(n), patchname))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	515
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	516 if patcherr:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	517 if not patchfound:
2934 2f190e998eb3 Teach mq about git patches Brendan Cully <brendan@kublai.com> parents: 2922 diff changeset	518 self.ui.warn("patch %s is empty\n" % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	519 err = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	520 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	521 self.ui.warn("patch failed, rejects left in working dir\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	522 err = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	523 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	524
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	525 if fuzz and strict:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	526 self.ui.warn("fuzz found when applying patch, stopping\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	527 err = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	528 break
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	529 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	530 return (err, n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	531
3085 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	532 def delete(self, repo, patches, opts):
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	533 realpatches = []
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	534 for patch in patches:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	535 patch = self.lookup(patch, strict=True)
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	536 info = self.isapplied(patch)
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	537 if info:
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	538 raise util.Abort(_("cannot delete applied patch %s") % patch)
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	539 if patch not in self.series:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	540 raise util.Abort(_("patch %s not in series file") % patch)
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	541 realpatches.append(patch)
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	542
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	543 appliedbase = 0
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	544 if opts.get('rev'):
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	545 if not self.applied:
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	546 raise util.Abort(_('no patches applied'))
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3700 diff changeset	547 revs = cmdutil.revrange(repo, opts['rev'])
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	548 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	549 revs.reverse()
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	550 for rev in revs:
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	551 if appliedbase >= len(self.applied):
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	552 raise util.Abort(_("revision %d is not managed") % rev)
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	553
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	554 base = revlog.bin(self.applied[appliedbase].rev)
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	555 node = repo.changelog.node(rev)
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	556 if node != base:
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	557 raise util.Abort(_("cannot delete revision %d above "
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	558 "applied patches") % rev)
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	559 realpatches.append(self.applied[appliedbase].name)
3085 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	560 appliedbase += 1
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	561
3085 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	562 if not opts.get('keep'):
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	563 r = self.qrepo()
5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	564 if r:
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	565 r.remove(realpatches, True)
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	566 else:
3373 58202386deb7 mq: make qdelete without -k or a subrepository delete all patches Brendan Cully <brendan@kublai.com> parents: 3371 diff changeset	567 for p in realpatches:
58202386deb7 mq: make qdelete without -k or a subrepository delete all patches Brendan Cully <brendan@kublai.com> parents: 3371 diff changeset	568 os.unlink(self.join(p))
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	569
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	570 if appliedbase:
3085 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	571 del self.applied[:appliedbase]
dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	572 self.applied_dirty = 1
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	573 indices = [self.find_series(p) for p in realpatches]
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	574 indices.sort()
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	575 for i in indices[-1::-1]:
790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	576 del self.full_series[i]
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	577 self.parse_series()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	578 self.series_dirty = 1
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	579
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	580 def check_toppatch(self, repo):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	581 if len(self.applied) > 0:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	582 top = revlog.bin(self.applied[-1].rev)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	583 pp = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	584 if top not in pp:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	585 raise util.Abort(_("queue top not at same revision as working directory"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	586 return top
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	587 return None
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	588 def check_localchanges(self, repo, force=False, refresh=True):
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	589 m, a, r, d = repo.status()[:4]
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	590 if m or a or r or d:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	591 if not force:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	592 if refresh:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	593 raise util.Abort(_("local changes found, refresh first"))
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	594 else:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	595 raise util.Abort(_("local changes found"))
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	596 return m, a, r, d
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	597 def new(self, repo, patch, msg=None, force=None):
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	598 if os.path.exists(self.join(patch)):
2710 ca97be5babf8 mq: do not allow to qnew a patch twice Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2699 diff changeset	599 raise util.Abort(_('patch "%s" already exists') % patch)
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	600 m, a, r, d = self.check_localchanges(repo, force)
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	601 commitfiles = m + a + r
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	602 self.check_toppatch(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	603 wlock = repo.wlock()
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	604 insert = self.full_series_end()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	605 if msg:
2511 041d8f0a8437 mq: hg qnew -f should refresh the new patch Chris Mason <mason@suse.com> parents: 2488 diff changeset	606 n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True,
041d8f0a8437 mq: hg qnew -f should refresh the new patch Chris Mason <mason@suse.com> parents: 2488 diff changeset	607 wlock=wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	608 else:
2511 041d8f0a8437 mq: hg qnew -f should refresh the new patch Chris Mason <mason@suse.com> parents: 2488 diff changeset	609 n = repo.commit(commitfiles,
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	610 "New patch: %s" % patch, force=True, wlock=wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	611 if n == None:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	612 raise util.Abort(_("repo commit failed"))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	613 self.full_series[insert:insert] = [patch]
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	614 self.applied.append(statusentry(revlog.hex(n), patch))
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	615 self.parse_series()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	616 self.series_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	617 self.applied_dirty = 1
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	618 p = self.opener(patch, "w")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	619 if msg:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	620 msg = msg + "\n"
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	621 p.write(msg)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	622 p.close()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	623 wlock = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	624 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	625 if r: r.add([patch])
2511 041d8f0a8437 mq: hg qnew -f should refresh the new patch Chris Mason <mason@suse.com> parents: 2488 diff changeset	626 if commitfiles:
2855 a3c73c9679d2 Fix "hg qnew -f foo" without -m Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2854 diff changeset	627 self.refresh(repo, short=True)
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	628 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	629
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	630 def strip(self, repo, rev, update=True, backup="all", wlock=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	631 def limitheads(chlog, stop):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	632 """return the list of all nodes that have no children"""
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	633 p = {}
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	634 h = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	635 stoprev = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	636 if stop in chlog.nodemap:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	637 stoprev = chlog.rev(stop)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	638
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3460 diff changeset	639 for r in xrange(chlog.count() - 1, -1, -1):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	640 n = chlog.node(r)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	641 if n not in p:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	642 h.append(n)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	643 if n == stop:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	644 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	645 if r < stoprev:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	646 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	647 for pn in chlog.parents(n):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	648 p[pn] = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	649 return h
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	650
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	651 def bundle(cg):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	652 backupdir = repo.join("strip-backup")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	653 if not os.path.isdir(backupdir):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	654 os.mkdir(backupdir)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	655 name = os.path.join(backupdir, "%s" % revlog.short(rev))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	656 name = savename(name)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	657 self.ui.warn("saving bundle to %s\n" % name)
3708 1debe70db9d7 Make mq use changegroup.writebundle for writing strip backups. Thomas Arendsen Hein <thomas@intevation.de> parents: 3707 diff changeset	658 return changegroup.writebundle(cg, name, "HG10BZ")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	659
3980 e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	660 def stripall(revnum):
e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	661 mm = repo.changectx(rev).manifest()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	662 seen = {}
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	663
3980 e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	664 for x in xrange(revnum, repo.changelog.count()):
e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	665 for f in repo.changectx(x).files():
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	666 if f in seen:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	667 continue
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	668 seen[f] = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	669 if f in mm:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	670 filerev = mm[f]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	671 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	672 filerev = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	673 seen[f] = filerev
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	674 # we go in two steps here so the strip loop happens in a
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	675 # sensible order. When stripping many files, this helps keep
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	676 # our disk access patterns under control.
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	677 seen_list = seen.keys()
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	678 seen_list.sort()
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	679 for f in seen_list:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	680 ff = repo.file(f)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	681 filerev = seen[f]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	682 if filerev != 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	683 if filerev in ff.nodemap:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	684 filerev = ff.rev(filerev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	685 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	686 filerev = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	687 ff.strip(filerev, revnum)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	688
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	689 if not wlock:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	690 wlock = repo.wlock()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	691 lock = repo.lock()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	692 chlog = repo.changelog
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	693 # TODO delete the undo files, and handle undo of merge sets
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	694 pp = chlog.parents(rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	695 revnum = chlog.rev(rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	696
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	697 if update:
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	698 self.check_localchanges(repo, refresh=False)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	699 urev = self.qparents(repo, rev)
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2804 diff changeset	700 hg.clean(repo, urev, wlock=wlock)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	701 repo.dirstate.write()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	702
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	703 # save is a list of all the branches we are truncating away
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	704 # that we actually want to keep. changegroup will be used
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	705 # to preserve them and add them back after the truncate
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	706 saveheads = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	707 savebases = {}
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	708
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	709 heads = limitheads(chlog, rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	710 seen = {}
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	711
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	712 # search through all the heads, finding those where the revision
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	713 # we want to strip away is an ancestor. Also look for merges
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	714 # that might be turned into new heads by the strip.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	715 while heads:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	716 h = heads.pop()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	717 n = h
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	718 while True:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	719 seen[n] = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	720 pp = chlog.parents(n)
4065 8ee983e3d461 fix strip'ping the second parent of a merge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4008 diff changeset	721 if pp[1] != revlog.nullid:
8ee983e3d461 fix strip'ping the second parent of a merge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4008 diff changeset	722 for p in pp:
8ee983e3d461 fix strip'ping the second parent of a merge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4008 diff changeset	723 if chlog.rev(p) > revnum and p not in seen:
8ee983e3d461 fix strip'ping the second parent of a merge Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4008 diff changeset	724 heads.append(p)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	725 if pp[0] == revlog.nullid:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	726 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	727 if chlog.rev(pp[0]) < revnum:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	728 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	729 n = pp[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	730 if n == rev:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	731 break
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	732 r = chlog.reachable(h, rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	733 if rev not in r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	734 saveheads.append(h)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	735 for x in r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	736 if chlog.rev(x) > revnum:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	737 savebases[x] = 1
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	738
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	739 # create a changegroup for all the branches we need to keep
2792 a3c6e7888abf mq: unused variables, improper usage of 'is [not]', undefined variable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2791 diff changeset	740 if backup == "all":
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	741 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	742 bundle(backupch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	743 if saveheads:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	744 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	745 chgrpfile = bundle(backupch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	746
3980 e9460fe2f548 mq: use contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3963 diff changeset	747 stripall(revnum)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	748
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	749 change = chlog.read(rev)
3072 e20e7e2623b0 strip: strip changelog before manifest Brendan Cully <brendan@kublai.com> parents: 3024 diff changeset	750 chlog.strip(revnum, revnum)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	751 repo.manifest.strip(repo.manifest.rev(change[0]), revnum)
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	752 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	753 if saveheads:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	754 self.ui.status("adding branch\n")
4008 6e0cb0790e23 mq: fix strip failing to unlink a bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3901 diff changeset	755 commands.unbundle(self.ui, repo, "file:%s" % chgrpfile,
6e0cb0790e23 mq: fix strip failing to unlink a bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3901 diff changeset	756 update=False)
2792 a3c6e7888abf mq: unused variables, improper usage of 'is [not]', undefined variable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2791 diff changeset	757 if backup != "strip":
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	758 os.unlink(chgrpfile)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	759
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	760 def isapplied(self, patch):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	761 """returns (index, rev, patch)"""
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	762 for i in xrange(len(self.applied)):
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	763 a = self.applied[i]
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	764 if a.name == patch:
ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	765 return (i, a.rev, a.name)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	766 return None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	767
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	768 # 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	769 # variations. If strict is passed, we try only #1
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	770 #
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	771 # 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	772 # 2) a unique substring of the patch name was given
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	773 # 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	774 def lookup(self, patch, strict=False):
2832 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	775 patch = patch and str(patch)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	776
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	777 def partial_name(s):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	778 if s in self.series:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	779 return s
2765 0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	780 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	781 if len(matches) > 1:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	782 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	783 for m in matches:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	784 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	785 return None
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	786 if matches:
0327bd1c831c mq: print matches if patch name not unique Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2757 diff changeset	787 return matches[0]
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	788 if len(self.series) > 0 and len(self.applied) > 0:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	789 if s == 'qtip':
3874 e88d03c2a3d9 mq: fix qheader without args when guards are applied after qtop Brendan Cully <brendan@kublai.com> parents: 3871 diff changeset	790 return self.series[self.series_end(True)-1]
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	791 if s == 'qbase':
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	792 return self.series[0]
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	793 return None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	794 if patch == None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	795 return None
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	796
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	797 # we don't want to return a partial match until we make
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	798 # sure the file name passed in does not exist (checked below)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	799 res = partial_name(patch)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	800 if res and res == patch:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	801 return res
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	802
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	803 if not os.path.isfile(self.join(patch)):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	804 try:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	805 sno = int(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	806 except(ValueError, OverflowError):
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	807 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	808 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	809 if sno < len(self.series):
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	810 return self.series[sno]
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	811 if not strict:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	812 # return any partial match made above
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	813 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	814 return res
3079 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	815 minus = patch.rfind('-')
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	816 if minus >= 0:
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	817 res = partial_name(patch[:minus])
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	818 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	819 i = self.series.index(res)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	820 try:
3079 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	821 off = int(patch[minus+1:] or 1)
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	822 except(ValueError, OverflowError):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	823 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	824 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	825 if i - off >= 0:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	826 return self.series[i - off]
3079 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	827 plus = patch.rfind('+')
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	828 if plus >= 0:
bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	829 res = partial_name(patch[:plus])
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	830 if res:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	831 i = self.series.index(res)
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	832 try:
3079 bed7cb835d8d Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. Thomas Arendsen Hein <thomas@intevation.de> parents: 3073 diff changeset	833 off = int(patch[plus+1:] or 1)
2696 be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	834 except(ValueError, OverflowError):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	835 pass
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	836 else:
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	837 if i + off < len(self.series):
be273f6074de mq: patch naming shortcuts Chris Mason <mason@suse.com> parents: 2694 diff changeset	838 return self.series[i + off]
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	839 raise util.Abort(_("patch %s not in series") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	840
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	841 def push(self, repo, patch=None, force=False, list=False,
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	842 mergeq=None, wlock=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	843 if not wlock:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	844 wlock = repo.wlock()
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	845 patch = self.lookup(patch)
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	846 # Suppose our series file is: A B C and the current 'top' patch is B.
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	847 # qpush C should be performed (moving forward)
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	848 # qpush B is a NOP (no change)
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	849 # qpush A is an error (can't go backwards with qpush)
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	850 if patch:
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	851 info = self.isapplied(patch)
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	852 if info:
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	853 if info[0] < len(self.applied) - 1:
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	854 raise util.Abort(_("cannot push to a previous patch: %s") %
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	855 patch)
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	856 if info[0] < len(self.series) - 1:
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	857 self.ui.warn(_('qpush: %s is already at the top\n') % patch)
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	858 else:
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	859 self.ui.warn(_('all patches are currently applied\n'))
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	860 return
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	861
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	862 # Following the above example, starting at 'top' of B:
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	863 # qpush should be performed (pushes C), but a subsequent qpush without
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	864 # an argument is an error (nothing to apply). This allows a loop
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	865 # of "...while hg qpush..." to work as it detects an error when done
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	866 if self.series_end() == len(self.series):
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	867 self.ui.warn(_('patch series already fully applied\n'))
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	868 return 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	869 if not force:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	870 self.check_localchanges(repo)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	871
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	872 self.applied_dirty = 1;
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	873 start = self.series_end()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	874 if start > 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	875 self.check_toppatch(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	876 if not patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	877 patch = self.series[start]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	878 end = start + 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	879 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	880 end = self.series.index(patch, start) + 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	881 s = self.series[start:end]
4418 0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	882 all_files = {}
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	883 try:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	884 if mergeq:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	885 ret = self.mergepatch(repo, mergeq, s, wlock)
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	886 else:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	887 ret = self.apply(repo, s, list, wlock=wlock,
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	888 all_files=all_files)
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	889 except:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	890 self.ui.warn(_('cleaning up working directory...'))
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	891 node = repo.dirstate.parents()[0]
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	892 hg.revert(repo, node, None, wlock)
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	893 unknown = repo.status(wlock=wlock)[4]
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	894 # only remove unknown files that we know we touched or
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	895 # created while patching
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	896 for f in unknown:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	897 if f in all_files:
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	898 util.unlink(repo.wjoin(f))
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	899 self.ui.warn(_('done\n'))
0532491f7476 MQ: tidy up if a qpush is interrupted. Bryan O'Sullivan <bos@serpentine.com> parents: 4408 diff changeset	900 raise
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	901 top = self.applied[-1].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	902 if ret[0]:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	903 self.ui.write("Errors during apply, please fix and refresh %s\n" %
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	904 top)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	905 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	906 self.ui.write("Now at: %s\n" % top)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	907 return ret[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	908
2697 6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	909 def pop(self, repo, patch=None, force=False, update=True, all=False,
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	910 wlock=None):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	911 def getfile(f, rev):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	912 t = repo.file(f).read(rev)
3982 714fbfe5c9e5 mq: remove unecessary code, duplicate with util.opener Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3980 diff changeset	913 repo.wfile(f, "w").write(t)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	914
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	915 if not wlock:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	916 wlock = repo.wlock()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	917 if patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	918 # index, rev, patch
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	919 info = self.isapplied(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	920 if not info:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	921 patch = self.lookup(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	922 info = self.isapplied(patch)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	923 if not info:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	924 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	925
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	926 if len(self.applied) == 0:
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	927 # Allow qpop -a to work repeatedly,
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	928 # but not qpop without an argument
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	929 self.ui.warn(_("no patches applied\n"))
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	930 return not all
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	931
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	932 if not update:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	933 parents = repo.dirstate.parents()
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	934 rr = [ revlog.bin(x.rev) for x in self.applied ]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	935 for p in parents:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	936 if p in rr:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	937 self.ui.warn("qpop: forcing dirstate update\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	938 update = True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	939
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	940 if not force and update:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	941 self.check_localchanges(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	942
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	943 self.applied_dirty = 1;
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	944 end = len(self.applied)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	945 if not patch:
2697 6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	946 if all:
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	947 popi = 0
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	948 else:
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	949 popi = len(self.applied) - 1
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	950 else:
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	951 popi = info[0] + 1
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	952 if popi >= end:
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	953 self.ui.warn("qpop: %s is already at the top\n" % patch)
6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	954 return
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	955 info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name]
2697 6c540dd14c38 mq: qpop should act like quilt pop Chris Mason <mason@suse.com> parents: 2696 diff changeset	956
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	957 start = info[0]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	958 rev = revlog.bin(info[1])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	959
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	960 # we know there are no local changes, so we can make a simplified
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	961 # form of hg.update.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	962 if update:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	963 top = self.check_toppatch(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	964 qp = self.qparents(repo, rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	965 changes = repo.changelog.read(qp)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	966 mmap = repo.manifest.read(changes[0])
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	967 m, a, r, d, u = repo.status(qp, top)[:5]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	968 if d:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	969 raise util.Abort("deletions found between repo revs")
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	970 for f in m:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	971 getfile(f, mmap[f])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	972 for f in r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	973 getfile(f, mmap[f])
2871 d36af1f10fdf manifest.execf is now a function. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2852 diff changeset	974 util.set_exec(repo.wjoin(f), mmap.execf(f))
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	975 repo.dirstate.update(m + r, 'n')
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	976 for f in a:
3699 4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	977 try:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	978 os.unlink(repo.wjoin(f))
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	979 except OSError, e:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	980 if e.errno != errno.ENOENT:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	981 raise
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	982 try: os.removedirs(os.path.dirname(repo.wjoin(f)))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	983 except: pass
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	984 if a:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	985 repo.dirstate.forget(a)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	986 repo.dirstate.setparents(qp, revlog.nullid)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	987 self.strip(repo, rev, update=False, backup='strip', wlock=wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	988 del self.applied[start:end]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	989 if len(self.applied):
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	990 self.ui.write("Now at: %s\n" % self.applied[-1].name)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	991 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	992 self.ui.write("Patch queue now empty\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	993
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	994 def diff(self, repo, pats, opts):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	995 top = self.check_toppatch(repo)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	996 if not top:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	997 self.ui.write("No patches applied\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	998 return
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	999 qp = self.qparents(repo, top)
3697 da262f35fbc8 add --git option to qdiff Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3692 diff changeset	1000 if opts.get('git'):
da262f35fbc8 add --git option to qdiff Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3692 diff changeset	1001 self.diffopts().git = True
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1002 self.printdiff(repo, qp, files=pats, opts=opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1003
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1004 def refresh(self, repo, pats=None, **opts):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1005 if len(self.applied) == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1006 self.ui.write("No patches applied\n")
2990 ac74046f8f58 qrefresh: exit with status 1 if no patches applied. Bryan O'Sullivan <bos@serpentine.com> parents: 2967 diff changeset	1007 return 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1008 wlock = repo.wlock()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1009 self.check_toppatch(repo)
3024 a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an Brendan Cully <brendan@kublai.com> parents: 2994 diff changeset	1010 (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1011 top = revlog.bin(top)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1012 cparents = repo.changelog.parents(top)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1013 patchparent = self.qparents(repo, top)
3024 a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an Brendan Cully <brendan@kublai.com> parents: 2994 diff changeset	1014 message, comments, user, date, patchfound = self.readheaders(patchfn)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1015
3024 a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an Brendan Cully <brendan@kublai.com> parents: 2994 diff changeset	1016 patchf = self.opener(patchfn, "w")
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1017 msg = opts.get('msg', '').rstrip()
2745 1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1018 if msg:
1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1019 if comments:
1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1020 # Remove existing message.
1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1021 ci = 0
4396 15289406f89c mq: account for readheaders munging in qrefresh Brendan Cully <brendan@kublai.com> parents: 4339 diff changeset	1022 subj = None
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3460 diff changeset	1023 for mi in xrange(len(message)):
4396 15289406f89c mq: account for readheaders munging in qrefresh Brendan Cully <brendan@kublai.com> parents: 4339 diff changeset	1024 if comments[ci].lower().startswith('subject: '):
15289406f89c mq: account for readheaders munging in qrefresh Brendan Cully <brendan@kublai.com> parents: 4339 diff changeset	1025 subj = comments[ci][9:]
15289406f89c mq: account for readheaders munging in qrefresh Brendan Cully <brendan@kublai.com> parents: 4339 diff changeset	1026 while message[mi] != comments[ci] and message[mi] != subj:
2745 1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1027 ci += 1
1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1028 del comments[ci]
1bac2bfe081a Change patch header as well as commit message with qrefresh -m or -l. Brendan Cully <brendan@kublai.com> parents: 2742 diff changeset	1029 comments.append(msg)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1030 if comments:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1031 comments = "\n".join(comments) + '\n\n'
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1032 patchf.write(comments)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1033
3698 a9090b264250 qrefresh: respect --git even in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3697 diff changeset	1034 if opts.get('git'):
a9090b264250 qrefresh: respect --git even in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3697 diff changeset	1035 self.diffopts().git = True
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1036 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1037 tip = repo.changelog.tip()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1038 if top == tip:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1039 # if the top of our patch queue is also the tip, there is an
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1040 # optimization here. We update the dirstate in place and strip
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1041 # off the tip commit. Then just commit the current directory
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1042 # tree. We can also send repo.commit the list of files
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1043 # changed to speed up the diff
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1044 #
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1045 # in short mode, we only diff the files included in the
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1046 # patch already
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1047 #
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1048 # this should really read:
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1049 # mm, dd, aa, aa2, uu = repo.status(tip, patchparent)[:5]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1050 # but we do it backwards to take advantage of manifest/chlog
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1051 # caching against the next repo.status call
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1052 #
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1053 mm, aa, dd, aa2, uu = repo.status(patchparent, tip)[:5]
3700 4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1054 changes = repo.changelog.read(tip)
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1055 man = repo.manifest.read(changes[0])
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1056 aaa = aa[:]
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1057 if opts.get('short'):
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1058 filelist = mm + aa + dd
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1059 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1060 filelist = None
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1061 m, a, r, d, u = repo.status(files=filelist)[:5]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1062
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1063 # we might end up with files that were added between tip and
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1064 # the dirstate parent, but then changed in the local dirstate.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1065 # in this case, we want them to only show up in the added section
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1066 for x in m:
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1067 if x not in aa:
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1068 mm.append(x)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1069 # we might end up with files added by the local dirstate that
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1070 # were deleted by the patch. In this case, they should only
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1071 # show up in the changed section.
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1072 for x in a:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1073 if x in dd:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1074 del dd[dd.index(x)]
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1075 mm.append(x)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1076 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1077 aa.append(x)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1078 # make sure any files deleted in the local dirstate
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1079 # are not in the add or change column of the patch
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1080 forget = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1081 for x in d + r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1082 if x in aa:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1083 del aa[aa.index(x)]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1084 forget.append(x)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1085 continue
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1086 elif x in mm:
3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1087 del mm[mm.index(x)]
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1088 dd.append(x)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1089
3566 4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	1090 m = util.unique(mm)
4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	1091 r = util.unique(dd)
4d97184a06ad Make util.unique return a list Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	1092 a = util.unique(aa)
4174 7307d2e98b32 fix qrefresh'ing an empty patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	1093 c = [filter(matchfn, l) for l in (m, a, r, [], u)]
7307d2e98b32 fix qrefresh'ing an empty patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	1094 filelist = util.unique(c[0] + c[1] + c[2])
3024 a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an Brendan Cully <brendan@kublai.com> parents: 2994 diff changeset	1095 patch.diff(repo, patchparent, files=filelist, match=matchfn,
4174 7307d2e98b32 fix qrefresh'ing an empty patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	1096 fp=patchf, changes=c, opts=self.diffopts())
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1097 patchf.close()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1098
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1099 repo.dirstate.setparents(*cparents)
3700 4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1100 copies = {}
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1101 for dst in a:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1102 src = repo.dirstate.copied(dst)
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1103 if src is None:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1104 continue
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1105 copies.setdefault(src, []).append(dst)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1106 repo.dirstate.update(a, 'a')
3700 4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1107 # remember the copies between patchparent and tip
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1108 # this may be slow, so don't do it if we're not tracking copies
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1109 if self.diffopts().git:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1110 for dst in aaa:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1111 f = repo.file(dst)
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1112 src = f.renamed(man[dst])
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1113 if src:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1114 copies[src[0]] = copies.get(dst, [])
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1115 if dst in a:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1116 copies[src[0]].append(dst)
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1117 # we can't copy a file created by the patch itself
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1118 if dst in copies:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1119 del copies[dst]
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1120 for src, dsts in copies.iteritems():
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1121 for dst in dsts:
4c158de5f245 qrefresh: fix handling of copies in the fast path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3699 diff changeset	1122 repo.dirstate.copy(src, dst)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1123 repo.dirstate.update(r, 'r')
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1124 # if the patch excludes a modified file, mark that file with mtime=0
5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1125 # so status can see it.
5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1126 mm = []
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3460 diff changeset	1127 for i in xrange(len(m)-1, -1, -1):
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1128 if not matchfn(m[i]):
5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1129 mm.append(m[i])
5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1130 del m[i]
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2873 diff changeset	1131 repo.dirstate.update(m, 'n')
4201 65aabd9f16f0 Refresh file size after partial qrefresh. Brendan Cully <brendan@kublai.com> parents: 4177 diff changeset	1132 repo.dirstate.update(mm, 'n', st_mtime=-1, st_size=-1)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1133 repo.dirstate.forget(forget)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1134
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1135 if not msg:
0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1136 if not message:
3024 a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an Brendan Cully <brendan@kublai.com> parents: 2994 diff changeset	1137 message = "patch queue: %s\n" % patchfn
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1138 else:
0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1139 message = "\n".join(message)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1140 else:
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1141 message = msg
0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1142
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1143 self.strip(repo, top, update=False, backup='strip', wlock=wlock)
4174 7307d2e98b32 fix qrefresh'ing an empty patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	1144 n = repo.commit(filelist, message, changes[1], match=matchfn,
7307d2e98b32 fix qrefresh'ing an empty patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	1145 force=1, wlock=wlock)
3024 a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an Brendan Cully <brendan@kublai.com> parents: 2994 diff changeset	1146 self.applied[-1] = statusentry(revlog.hex(n), patchfn)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1147 self.applied_dirty = 1
4202 b7e66db28571 Remove undo log after mq operations that rollback would break Brendan Cully <brendan@kublai.com> parents: 4201 diff changeset	1148 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1149 else:
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2872 diff changeset	1150 self.printdiff(repo, patchparent, fp=patchf)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1151 patchf.close()
3699 4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1152 added = repo.status()[1]
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1153 for a in added:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1154 f = repo.wjoin(a)
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1155 try:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1156 os.unlink(f)
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1157 except OSError, e:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1158 if e.errno != errno.ENOENT:
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1159 raise
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1160 try: os.removedirs(os.path.dirname(f))
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1161 except: pass
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1162 # forget the file copies in the dirstate
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1163 # push should readd the files later on
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3698 diff changeset	1164 repo.dirstate.forget(added)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1165 self.pop(repo, force=True, wlock=wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1166 self.push(repo, force=True, wlock=wlock)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1167
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1168 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	1169 if not create and os.path.isdir(self.path):
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	1170 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	1171 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	1172 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	1173 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	1174 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	1175 raise
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1176 if create:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1177 return self.qrepo(create=True)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1178
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1179 def unapplied(self, repo, patch=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1180 if patch and patch not in self.series:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	1181 raise util.Abort(_("patch %s is not in series file") % patch)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1182 if not patch:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1183 start = self.series_end()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1184 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1185 start = self.series.index(patch) + 1
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1186 unapplied = []
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1187 for i in xrange(start, len(self.series)):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1188 pushable, reason = self.pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1189 if pushable:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1190 unapplied.append((i, self.series[i]))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1191 self.explain_pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1192 return unapplied
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1193
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1194 def qseries(self, repo, missing=None, start=0, length=None, status=None,
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1195 summary=False):
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1196 def displayname(patchname):
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1197 if summary:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1198 msg = self.readheaders(patchname)[0]
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1199 msg = msg and ': ' + msg[0] or ': '
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1200 else:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1201 msg = ''
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1202 return '%s%s' % (patchname, msg)
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1203
3763 955475d237fc fix qseries -v and guards interaction Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3708 diff changeset	1204 applied = dict.fromkeys([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	1205 if length is None:
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1206 length = len(self.series) - start
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1207 if not missing:
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3460 diff changeset	1208 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	1209 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	1210 if patch in applied:
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1211 stat = 'A'
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1212 elif self.pushable(i)[0]:
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1213 stat = 'U'
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1214 else:
417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1215 stat = 'G'
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1216 pfx = ''
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1217 if self.ui.verbose:
3763 955475d237fc fix qseries -v and guards interaction Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3708 diff changeset	1218 pfx = '%d %s ' % (i, stat)
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1219 elif status and status != stat:
4238 ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4174 diff changeset	1220 continue
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1221 self.ui.write('%s%s\n' % (pfx, displayname(patch)))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1222 else:
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1223 msng_list = []
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1224 for root, dirs, files in os.walk(self.path):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1225 d = root[len(self.path) + 1:]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1226 for f in files:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1227 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	1228 if (fl not in self.series and
4241 7c59ade0f0d6 hg qseries -m: guards file was not ignored Thomas Arendsen Hein <thomas@intevation.de> parents: 4239 diff changeset	1229 fl not in (self.status_path, self.series_path,
7c59ade0f0d6 hg qseries -m: guards file was not ignored Thomas Arendsen Hein <thomas@intevation.de> parents: 4239 diff changeset	1230 self.guards_path)
1852 fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now. Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	1231 and not fl.startswith('.')):
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1232 msng_list.append(fl)
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1233 msng_list.sort()
2790 e5e23cae6e09 mq: remove unecessary test Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2789 diff changeset	1234 for x in msng_list:
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1235 pfx = self.ui.verbose and ('D ') or ''
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1236 self.ui.write("%s%s\n" % (pfx, displayname(x)))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1237
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1238 def issaveline(self, l):
2805 52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	1239 if l.name == '.hg.patches.save.line':
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1240 return True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1241
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1242 def qrepo(self, create=False):
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	1243 if create or os.path.isdir(self.join(".hg")):
1839 876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1810 diff changeset	1244 return hg.repository(self.ui, path=self.path, create=create)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1245
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1246 def restore(self, repo, rev, delete=None, qupdate=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1247 c = repo.changelog.read(rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1248 desc = c[4].strip()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1249 lines = desc.splitlines()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1250 i = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1251 datastart = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1252 series = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1253 applied = []
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1254 qpp = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1255 for i in xrange(0, len(lines)):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1256 if lines[i] == 'Patch Data:':
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1257 datastart = i + 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1258 elif lines[i].startswith('Dirstate:'):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1259 l = lines[i].rstrip()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1260 l = l[10:].split(' ')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1261 qpp = [ hg.bin(x) for x in l ]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1262 elif datastart != None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1263 l = lines[i].rstrip()
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	1264 se = statusentry(l)
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1265 file_ = se.name
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1266 if se.rev:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1267 applied.append(se)
3178 b3e103c388fc mq: don't write applied patches into series twice in restore Brendan Cully <brendan@kublai.com> parents: 3177 diff changeset	1268 else:
b3e103c388fc mq: don't write applied patches into series twice in restore Brendan Cully <brendan@kublai.com> parents: 3177 diff changeset	1269 series.append(file_)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1270 if datastart == None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1271 self.ui.warn("No saved patch data found\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1272 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1273 self.ui.warn("restoring status: %s\n" % lines[0])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1274 self.full_series = series
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1275 self.applied = applied
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	1276 self.parse_series()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1277 self.series_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1278 self.applied_dirty = 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1279 heads = repo.changelog.heads()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1280 if delete:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1281 if rev not in heads:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1282 self.ui.warn("save entry has children, leaving it alone\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1283 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1284 self.ui.warn("removing save entry %s\n" % hg.short(rev))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1285 pp = repo.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1286 if rev in pp:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1287 update = True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1288 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1289 update = False
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1290 self.strip(repo, rev, update=update, backup='strip')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1291 if qpp:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1292 self.ui.warn("saved queue repository parents: %s %s\n" %
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1293 (hg.short(qpp[0]), hg.short(qpp[1])))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1294 if qupdate:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1295 print "queue directory updating"
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1296 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1297 if not r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1298 self.ui.warn("Unable to load queue repository\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1299 return 1
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2804 diff changeset	1300 hg.clean(r, qpp[0])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1301
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1302 def save(self, repo, msg=None):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1303 if len(self.applied) == 0:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1304 self.ui.warn("save: no patches applied, exiting\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1305 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1306 if self.issaveline(self.applied[-1]):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1307 self.ui.warn("status is already saved\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1308 return 1
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1309
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1310 ar = [ ':' + x for x in self.full_series ]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1311 if not msg:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1312 msg = "hg patches saved state"
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1313 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1314 msg = "hg patches: " + msg.rstrip('\r\n')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1315 r = self.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1316 if r:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1317 pp = r.dirstate.parents()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1318 msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1]))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1319 msg += "\n\nPatch Data:\n"
2805 52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	1320 text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and
52516e48e3f3 Update qsave to use StatusEntry; don't throw exception on bad status lines. Brendan Cully <brendan@kublai.com> parents: 2804 diff changeset	1321 "\n".join(ar) + '\n' or "")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1322 n = repo.commit(None, text, user=None, force=1)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1323 if not n:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1324 self.ui.warn("repo commit failed\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1325 return 1
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	1326 self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1327 self.applied_dirty = 1
4209 dbc3846c09a1 Merge with -stable, fix small test failure Matt Mackall <mpm@selenic.com> parents: 4202 diff changeset	1328 self.removeundo(repo)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1329
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1330 def full_series_end(self):
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1331 if len(self.applied) > 0:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1332 p = self.applied[-1].name
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1333 end = self.find_series(p)
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1334 if end == None:
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1335 return len(self.full_series)
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1336 return end + 1
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1337 return 0
c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1338
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1339 def series_end(self, all_patches=False):
4408 f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4338 diff changeset	1340 """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: 4338 diff changeset	1341 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: 4338 diff changeset	1342 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: 4338 diff changeset	1343 """
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1344 end = 0
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1345 def next(start):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1346 if all_patches:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1347 return start
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1348 i = start
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1349 while i < len(self.series):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1350 p, reason = self.pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1351 if p:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1352 break
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1353 self.explain_pushable(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1354 i += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1355 return i
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1356 if len(self.applied) > 0:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1357 p = self.applied[-1].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1358 try:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1359 end = self.series.index(p)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1360 except ValueError:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1361 return 0
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1362 return next(end + 1)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1363 return next(end)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1364
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1365 def appliedname(self, index):
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1366 pname = self.applied[index].name
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1367 if not self.ui.verbose:
2677 ec05ce9cbf47 mq: uniform verbose display of patche[s]. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2664 diff changeset	1368 p = pname
ec05ce9cbf47 mq: uniform verbose display of patche[s]. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2664 diff changeset	1369 else:
2941 d32df6452323 mq: fix appliedname Brendan Cully <brendan@kublai.com> parents: 2940 diff changeset	1370 p = str(self.series.index(pname)) + " " + pname
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1371 return p
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1372
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1373 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	1374 force=None, git=False):
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1375 def checkseries(patchname):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1376 if patchname in self.series:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1377 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: 3128 diff changeset	1378 % patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1379 def checkfile(patchname):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1380 if not force and os.path.exists(self.join(patchname)):
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1381 raise util.Abort(_('patch "%s" already exists')
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1382 % patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1383
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1384 if rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1385 if files:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1386 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: 3128 diff changeset	1387 'files'))
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3700 diff changeset	1388 rev = cmdutil.revrange(repo, rev)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1389 rev.sort(lambda x, y: cmp(y, x))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1390 if (len(files) > 1 or len(rev) > 1) and patchname:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	1391 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: 3128 diff changeset	1392 'patches'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1393 i = 0
2488 2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1394 added = []
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1395 if rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1396 # 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: 3128 diff changeset	1397 # that form a linear path to qbase.
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1398 # 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: 3128 diff changeset	1399 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: 3128 diff changeset	1400 if len(heads) > 1:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1401 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: 3128 diff changeset	1402 'branch') % rev[-1])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1403 if self.applied:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1404 base = revlog.hex(repo.changelog.node(rev[0]))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1405 if base in [n.rev for n in self.applied]:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1406 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: 3128 diff changeset	1407 % rev[0])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1408 if heads != [revlog.bin(self.applied[-1].rev)]:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1409 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: 3128 diff changeset	1410 'the queue') % rev[0])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1411 base = repo.changelog.rev(revlog.bin(self.applied[0].rev))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1412 lastparent = repo.changelog.parentrevs(base)[0]
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1413 else:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1414 if heads != [repo.changelog.node(rev[0])]:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1415 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: 3128 diff changeset	1416 % rev[0])
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1417 lastparent = None
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1418
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1419 if git:
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1420 self.diffopts().git = True
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1421
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1422 for r in rev:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1423 p1, p2 = repo.changelog.parentrevs(r)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1424 n = repo.changelog.node(r)
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3568 diff changeset	1425 if p2 != revlog.nullrev:
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1426 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: 3128 diff changeset	1427 if lastparent and lastparent != r:
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1428 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: 3128 diff changeset	1429 % (r, lastparent))
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1430 lastparent = p1
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1431
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1432 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1433 patchname = normname('%d.diff' % r)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1434 checkseries(patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1435 checkfile(patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1436 self.full_series.insert(0, patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1437
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1438 patchf = self.opener(patchname, "w")
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1439 patch.export(repo, [n], fp=patchf, opts=self.diffopts())
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1440 patchf.close()
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1441
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1442 se = statusentry(revlog.hex(n), patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1443 self.applied.insert(0, se)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1444
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1445 added.append(patchname)
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1446 patchname = None
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1447 self.parse_series()
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1448 self.applied_dirty = 1
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1449
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1450 for filename in files:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1451 if existing:
3533 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1452 if filename == '-':
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1453 raise util.Abort(_('-e is incompatible with import from -'))
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1454 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1455 patchname = normname(filename)
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1456 if not os.path.isfile(self.join(patchname)):
15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1457 raise util.Abort(_("patch %s does not exist") % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1458 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1459 try:
3533 891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1460 if filename == '-':
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1461 if not patchname:
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1462 raise util.Abort(_('need --name to import a patch from -'))
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1463 text = sys.stdin.read()
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1464 else:
891c8d20f80f mq: support qimport - Brendan Cully <brendan@kublai.com> parents: 3486 diff changeset	1465 text = file(filename).read()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1466 except IOError:
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1467 raise util.Abort(_("unable to read %s") % patchname)
15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1468 if not patchname:
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1469 patchname = normname(os.path.basename(filename))
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1470 checkfile(patchname)
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1471 patchf = self.opener(patchname, "w")
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1472 patchf.write(text)
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1473 checkseries(patchname)
2698 c1123e83c8e2 mq: fix qnew and qimport to deal with series file comments Chris Mason <mason@suse.com> parents: 2697 diff changeset	1474 index = self.full_series_end() + i
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1475 self.full_series[index:index] = [patchname]
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	1476 self.parse_series()
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1477 self.ui.warn("adding %s to series file\n" % patchname)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1478 i += 1
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1479 added.append(patchname)
15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1480 patchname = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1481 self.series_dirty = 1
2488 2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1482 qrepo = self.qrepo()
2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1483 if qrepo:
2785aeb51be4 mq: add qimported patches if patch dir is a repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	1484 qrepo.add(added)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1485
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1486 def delete(ui, repo, patches, *opts):
2890 790fd342b6c7 Allow qdel to delete multiple patches. Brendan Cully <brendan@kublai.com> parents: 2889 diff changeset	1487 """remove patches from queue
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	1488
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1489 With --rev, mq will stop managing the named revisions. The
3085 dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	1490 patches must be applied and at the base of the stack. This option
dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	1491 is useful when the patches have been applied upstream.
dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	1492
dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	1493 Otherwise, the patches must not be applied.
dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	1494
dc784839516d mq: add qdelete --forget option Brendan Cully <brendan@kublai.com> parents: 3084 diff changeset	1495 With --keep, the patch files are preserved in the patch directory."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1496 q = repo.mq
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	1497 q.delete(repo, patches, opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1498 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1499 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1500
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1501 def applied(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1502 """print the patches already applied"""
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1503 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1504 if patch:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1505 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	1506 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	1507 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	1508 else:
4239 417c2068cb92 Simplified qseries and hg qapplied to fix some bugs caused by optimization: Thomas Arendsen Hein <thomas@intevation.de> parents: 4238 diff changeset	1509 end = q.series_end(True)
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1510 return q.qseries(repo, length=end, status='A', summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1511
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1512 def unapplied(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1513 """print the patches not yet applied"""
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1514 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1515 if patch:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1516 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	1517 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	1518 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	1519 else:
4238 ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4174 diff changeset	1520 start = q.series_end(True)
ce6c364ebb2a Fix issue443: inconsistent output of "hg qunapplied -v" Thomas Arendsen Hein <thomas@intevation.de> parents: 4174 diff changeset	1521 q.qseries(repo, start=start, status='U', summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1522
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1523 def qimport(ui, repo, filename, *opts):
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1524 """import a patch
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1525
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1526 The patch will have the same name as its source file unless you
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1527 give it a new one with --name.
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1528
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1529 You can register an existing patch inside the patch directory
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1530 with the --existing flag.
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1531
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1532 With --force, an existing patch of the same name will be overwritten.
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1533
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1534 An existing changeset may be placed under mq control with --rev
e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1535 (e.g. qimport --rev tip -n patch will place tip under mq control).
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1536 With --git, patches imported with --rev will use the git diff
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1537 format.
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	1538 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1539 q = repo.mq
3128 15fde1970003 qimport: rename patch to patchname to avoid shadowing module Brendan Cully <brendan@kublai.com> parents: 3088 diff changeset	1540 q.qimport(repo, filename, patchname=opts['name'],
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1541 existing=opts['existing'], force=opts['force'], rev=opts['rev'],
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	1542 git=opts['git'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1543 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1544 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1545
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1546 def init(ui, repo, **opts):
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1547 """init a new queue repository
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1548
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1549 The queue repository is unversioned by default. If -c is
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1550 specified, qinit will create a separate nested repository
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1551 for patches. Use qcommit to commit changes to this queue
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1552 repository."""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1553 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1554 r = q.init(repo, create=opts['create_repo'])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1555 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1556 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	1557 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	1558 fp = r.wopener('.hgignore', 'w')
165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1559 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	1560 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	1561 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	1562 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	1563 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	1564 r.wopener('series', 'w').close()
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1565 r.add(['.hgignore', 'series'])
4071 165abe554c80 mq: qinit -c creates a repo even after a regular qinit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4068 diff changeset	1566 commands.add(ui, r)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1567 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1568
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1569 def clone(ui, source, dest=None, **opts):
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1570 '''clone main and patch repository at same time
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1571
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1572 If source is local, destination will have no patches applied. If
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1573 source is remote, this command can not check if patches are
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1574 applied in source, so cannot guarantee that patches are not
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1575 applied in destination. If you clone remote repository, be sure
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1576 before that it has no patches applied.
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1577
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1578 Source patch repository is looked for in <src>/.hg/patches by
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1579 default. Use -p <url> to change.
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1580 '''
2766 c5ac397f7671 fix call to commands.setremoteconfig Bryan O'Sullivan <bos@serpentine.com> parents: 2765 diff changeset	1581 commands.setremoteconfig(ui, opts)
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1582 if dest is None:
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1583 dest = hg.defaultdest(source)
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1584 sr = hg.repository(ui, ui.expandpath(source))
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1585 qbase, destrev = None, None
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1586 if sr.local():
2725 9ffee4f07323 mq: update to handle repomap not longer used Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2724 diff changeset	1587 if sr.mq.applied:
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1588 qbase = revlog.bin(sr.mq.applied[0].rev)
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1589 if not hg.islocal(dest):
4172 1df1baf2002e fix qclone to a remote repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4133 diff changeset	1590 heads = dict.fromkeys(sr.heads())
1df1baf2002e fix qclone to a remote repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4133 diff changeset	1591 for h in sr.heads(qbase):
1df1baf2002e fix qclone to a remote repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4133 diff changeset	1592 del heads[h]
1df1baf2002e fix qclone to a remote repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4133 diff changeset	1593 destrev = heads.keys()
1df1baf2002e fix qclone to a remote repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4133 diff changeset	1594 destrev.append(sr.changelog.parents(qbase)[0])
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1595 ui.note(_('cloning main repo\n'))
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1596 sr, dr = hg.clone(ui, sr, dest,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1597 pull=opts['pull'],
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1598 rev=destrev,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1599 update=False,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1600 stream=opts['uncompressed'])
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1601 ui.note(_('cloning patch repo\n'))
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1602 spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'),
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1603 dr.url() + '/.hg/patches',
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1604 pull=opts['pull'],
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1605 update=not opts['noupdate'],
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1606 stream=opts['uncompressed'])
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1607 if dr.local():
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1608 if qbase:
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1609 ui.note(_('stripping applied patches from destination repo\n'))
2725 9ffee4f07323 mq: update to handle repomap not longer used Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2724 diff changeset	1610 dr.mq.strip(dr, qbase, update=False, backup=None)
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1611 if not opts['noupdate']:
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1612 ui.note(_('updating destination repo\n'))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2772 diff changeset	1613 hg.update(dr, dr.changelog.tip())
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	1614
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1615 def commit(ui, repo, pats, *opts):
2526 37785f986260 mq: Added help for qcommit, consistently talk about queue repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2488 diff changeset	1616 """commit changes in the queue repository"""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1617 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1618 r = q.qrepo()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1619 if not r: raise util.Abort('no queue repository')
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1620 commands.commit(r.ui, r, pats, *opts)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1621
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1622 def series(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1623 """print the entire series file"""
2756 caa6d992608b Add -s option to qseries: display first line of patch header. Brendan Cully <brendan@kublai.com> parents: 2754 diff changeset	1624 repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1625 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1626
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1627 def top(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1628 """print the name of the current patch"""
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1629 q = repo.mq
4408 f700ea2b0689 mq: fix qtop failure when the series ends with guarded patches. Patrick Mezard <pmezard@gmail.com> parents: 4338 diff changeset	1630 t = q.applied and q.series_end(True) or 0
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1631 if t:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1632 return q.qseries(repo, start=t-1, length=1, status='A',
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1633 summary=opts.get('summary'))
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1634 else:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1635 ui.write("No patches applied\n")
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1636 return 1
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1637
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1638 def next(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1639 """print the name of the next patch"""
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1640 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1641 end = q.series_end()
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1642 if end == len(q.series):
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1643 ui.write("All patches applied\n")
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1644 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1645 return q.qseries(repo, start=end, length=1, summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1646
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1647 def prev(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1648 """print the name of the previous patch"""
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1649 q = repo.mq
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1650 l = len(q.applied)
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1651 if l == 1:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1652 ui.write("Only one patch applied\n")
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1653 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1654 if not l:
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1655 ui.write("No patches applied\n")
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1656 return 1
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1657 return q.qseries(repo, start=l-2, length=1, status='A',
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	1658 summary=opts.get('summary'))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1659
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1660 def new(ui, repo, patch, **opts):
2754 19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1661 """create a new patch
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1662
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1663 qnew creates a new patch on top of the currently-applied patch
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1664 (if any). It will refuse to run if there are any outstanding
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1665 changes unless -f is specified, in which case the patch will
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1666 be initialised with them.
19041b8cbc86 Add more verbose help text to mq commands. Brendan Cully <brendan@kublai.com> parents: 2753 diff changeset	1667
2939 abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	1668 -e, -m or -l set the patch header as well as the commit message.
abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	1669 If none is specified, the patch header is empty and the
2770 5f8259e4d292 Clean up qnew help text. Brendan Cully <brendan@kublai.com> parents: 2767 diff changeset	1670 commit message is 'New patch: PATCH'"""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1671 q = repo.mq
2804 4b20daa25f15 Update mq to use new logmessage arglist from 2794:bd8a9a94139f Brendan Cully <brendan@kublai.com> parents: 2803 diff changeset	1672 message = commands.logmessage(opts)
2939 abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	1673 if opts['edit']:
abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	1674 message = ui.edit(message, ui.username())
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1675 q.new(repo, patch, msg=message, force=opts['force'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1676 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1677 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1678
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	1679 def refresh(ui, repo, pats, *opts):
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1680 """update the current patch
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1681
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1682 If any file patterns are provided, the refreshed patch will contain only
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1683 the modifications that match those patterns; the remaining modifications
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1684 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: 4039 diff changeset	1685
5d6b3fa62736 mq: Mention usage of hg add/remove/copy/rename in qrefresh help text. Thomas Arendsen Hein <thomas@intevation.de> parents: 4039 diff changeset	1686 hg add/remove/copy/rename work as usual, though you might want to use
5d6b3fa62736 mq: Mention usage of hg add/remove/copy/rename in qrefresh help text. Thomas Arendsen Hein <thomas@intevation.de> parents: 4039 diff changeset	1687 git-style patches (--git or [diff] git=1) to track copies and renames.
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1688 """
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1689 q = repo.mq
2804 4b20daa25f15 Update mq to use new logmessage arglist from 2794:bd8a9a94139f Brendan Cully <brendan@kublai.com> parents: 2803 diff changeset	1690 message = commands.logmessage(opts)
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1691 if opts['edit']:
0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1692 if message:
0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1693 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
2775 ee48e5ef8753 Use StatusEntry class instead of repeated status line parsing. Brendan Cully <brendan@kublai.com> parents: 2765 diff changeset	1694 patch = q.applied[-1].name
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1695 (message, comment, user, date, hasdiff) = q.readheaders(patch)
0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	1696 message = ui.edit('\n'.join(message), user or ui.username())
2990 ac74046f8f58 qrefresh: exit with status 1 if no patches applied. Bryan O'Sullivan <bos@serpentine.com> parents: 2967 diff changeset	1697 ret = q.refresh(repo, pats, msg=message, **opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1698 q.save_dirty()
2990 ac74046f8f58 qrefresh: exit with status 1 if no patches applied. Bryan O'Sullivan <bos@serpentine.com> parents: 2967 diff changeset	1699 return ret
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1700
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1701 def diff(ui, repo, pats, *opts):
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1702 """diff of the current patch"""
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	1703 repo.mq.diff(repo, pats, opts)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1704 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1705
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1706 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	1707 """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	1708
2771 519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1709 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	1710 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	1711 patches apply successfully, the current patch will be refreshed
519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1712 with the new cumulative patch, and the folded patches will
2889 57b88b86a845 Replace qdel/qfold -f option with -k/--keep. Brendan Cully <brendan@kublai.com> parents: 2882 diff changeset	1713 be deleted. With -k/--keep, the folded patch files will not
2771 519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1714 be removed afterwards.
519bf0cd28d2 Add -f option to qfold; improve qfold documentation. Brendan Cully <brendan@kublai.com> parents: 2770 diff changeset	1715
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1716 The header for each folded patch will be concatenated with
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1717 the current patch header, separated by a line of '* * *'."""
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1718
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1719 q = repo.mq
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1720
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1721 if not files:
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1722 raise util.Abort(_('qfold requires at least one patch name'))
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1723 if not q.check_toppatch(repo):
3069 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 3024 diff changeset	1724 raise util.Abort(_('No patches applied'))
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1725
2804 4b20daa25f15 Update mq to use new logmessage arglist from 2794:bd8a9a94139f Brendan Cully <brendan@kublai.com> parents: 2803 diff changeset	1726 message = commands.logmessage(opts)
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1727 if opts['edit']:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1728 if message:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1729 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	1730
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1731 parent = q.lookup('qtip')
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1732 patches = []
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1733 messages = []
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1734 for f in files:
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1735 p = q.lookup(f)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1736 if p in patches or p == parent:
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1737 ui.warn(_('Skipping already folded patch %s') % p)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1738 if q.isapplied(p):
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1739 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	1740 patches.append(p)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1741
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1742 for p in patches:
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1743 if not message:
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1744 messages.append(q.readheaders(p)[0])
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1745 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	1746 (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	1747 if not patchsuccess:
2936 21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1748 raise util.Abort(_('Error folding patch %s') % p)
21bf8929efc8 Fix qfold after recent changes Brendan Cully <brendan@kublai.com> parents: 2934 diff changeset	1749 patch.updatedir(ui, repo, files)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1750
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1751 if not message:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1752 message, comments, user = q.readheaders(parent)[0:3]
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1753 for msg in messages:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1754 message.append('* * *')
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1755 message.extend(msg)
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1756 message = '\n'.join(message)
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1757
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1758 if opts['edit']:
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1759 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	1760
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1761 q.refresh(repo, msg=message)
3243 1d3aceae87c1 mq: update qfold to call delete correctly Brendan Cully <brendan@kublai.com> parents: 3215 diff changeset	1762 q.delete(repo, patches, opts)
2748 752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1763 q.save_dirty()
752b9475a700 New mq command qfold: Merge patches into the current patch. Brendan Cully <brendan@kublai.com> parents: 2747 diff changeset	1764
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1765 def guard(ui, repo, args, *opts):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1766 '''set or print guards for a patch
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1767
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1768 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	1769 guards is always pushed. A patch with a positive guard ("+foo") is
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1770 pushed only if the qselect command has activated it. A patch with
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1771 a negative guard ("-foo") is never pushed if the qselect command
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1772 has activated it.
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1773
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1774 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	1775 With arguments, set guards for the named patch.
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1776
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1777 To set a negative guard "-foo" on topmost patch ("--" is needed so
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1778 hg will not interpret "-foo" as an option):
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1779 hg qguard -- -foo
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1780
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1781 To set guards on another patch:
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	1782 hg qguard other.patch +2.6.17 -stable
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1783 '''
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1784 def status(idx):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1785 guards = q.series_guards[idx] or ['unguarded']
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1786 ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards)))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1787 q = repo.mq
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1788 patch = None
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1789 args = list(args)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1790 if opts['list']:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1791 if args or opts['none']:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1792 raise util.Abort(_('cannot mix -l/--list with options or arguments'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1793 for i in xrange(len(q.series)):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1794 status(i)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1795 return
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1796 if not args or args[0][0:1] in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1797 if not q.applied:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1798 raise util.Abort(_('no patches applied'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1799 patch = q.applied[-1].name
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1800 if patch is None and args[0][0:1] not in '-+':
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1801 patch = args.pop(0)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1802 if patch is None:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1803 raise util.Abort(_('no patch to work with'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1804 if args or opts['none']:
4133 a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	1805 idx = q.find_series(patch)
a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	1806 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	1807 raise util.Abort(_('no patch named %s') % patch)
a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard Christian Ebert <blacktrash@gmx.net> parents: 4090 diff changeset	1808 q.set_guards(idx, args)
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1809 q.save_dirty()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1810 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1811 status(q.series.index(q.lookup(patch)))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1812
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1813 def header(ui, repo, patch=None):
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1814 """Print the header of the topmost or specified patch"""
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1815 q = repo.mq
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1816
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1817 if patch:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1818 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	1819 else:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1820 if not q.applied:
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1821 ui.write('No patches applied\n')
2994 c203ccd7d838 qheader: exit withh meaningful error code. Bryan O'Sullivan <bos@serpentine.com> parents: 2992 diff changeset	1822 return 1
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1823 patch = q.lookup('qtip')
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1824 message = repo.mq.readheaders(patch)[0]
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1825
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1826 ui.write('\n'.join(message) + '\n')
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	1827
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1828 def lastsavename(path):
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1829 (directory, base) = os.path.split(path)
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1830 names = os.listdir(directory)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1831 namere = re.compile("%s.([0-9]+)" % base)
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1832 maxindex = None
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1833 maxname = None
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1834 for f in names:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1835 m = namere.match(f)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1836 if m:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1837 index = int(m.group(1))
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1838 if maxindex == None or index > maxindex:
86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1839 maxindex = index
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1840 maxname = f
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1841 if maxname:
2789 86c54b7cd331 mq: fix variables shadowing builtin Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2787 diff changeset	1842 return (os.path.join(directory, maxname), maxindex)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1843 return (None, None)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1844
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1845 def savename(path):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1846 (last, index) = lastsavename(path)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1847 if last is None:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1848 index = 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1849 newpath = path + ".%d" % (index + 1)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1850 return newpath
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1851
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1852 def push(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1853 """push the next patch onto the stack"""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1854 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1855 mergeq = None
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1856
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1857 if opts['all']:
3604 437489d8dfbf mq: handle qpush -a with empty series Brendan Cully <brendan@kublai.com> parents: 3578 diff changeset	1858 if not q.series:
4100 c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	1859 ui.warn(_('no patches in series\n'))
c30c922f907a Modify qpush/qpop idempotent operations to return success Ben Thomas <bthomas@virtualiron.com> parents: 4099 diff changeset	1860 return 0
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1861 patch = q.series[-1]
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1862 if opts['merge']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1863 if opts['name']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1864 newpath = opts['name']
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1865 else:
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1866 newpath, i = lastsavename(q.path)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1867 if not newpath:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1868 ui.warn("no saved queues found, please use -n\n")
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1869 return 1
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1870 mergeq = queue(ui, repo.join(""), newpath)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1871 ui.warn("merging with queue at: %s\n" % mergeq.path)
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1872 ret = q.push(repo, patch, force=opts['force'], list=opts['list'],
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1873 mergeq=mergeq)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1874 return ret
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1875
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1876 def pop(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1877 """pop the current patch off the stack"""
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1878 localupdate = True
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1879 if opts['name']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1880 q = queue(ui, repo.join(""), repo.join(opts['name']))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1881 ui.warn('using patch queue: %s\n' % q.path)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1882 localupdate = False
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1883 else:
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1884 q = repo.mq
4099 cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	1885 ret = q.pop(repo, patch, force=opts['force'], update=localupdate,
cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	1886 all=opts['all'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1887 q.save_dirty()
4099 cf5580c16b13 mq: propagate the return error of pop Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4096 diff changeset	1888 return ret
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1889
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1890 def rename(ui, repo, patch, name=None, **opts):
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1891 """rename a patch
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1892
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1893 With one argument, renames the current patch to PATCH1.
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1894 With two arguments, renames PATCH1 to PATCH2."""
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1895
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1896 q = repo.mq
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1897
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1898 if not name:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1899 name = patch
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1900 patch = None
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1901
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1902 if patch:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1903 patch = q.lookup(patch)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1904 else:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1905 if not q.applied:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1906 ui.write(_('No patches applied\n'))
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1907 return
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1908 patch = q.lookup('qtip')
3080 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1909 absdest = q.join(name)
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1910 if os.path.isdir(absdest):
4037 bbdba01cce28 Enforce unixish style for all generated patch names. Patrick Mezard <pmezard@gmail.com> parents: 4016 diff changeset	1911 name = normname(os.path.join(name, os.path.basename(patch)))
3080 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1912 absdest = q.join(name)
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1913 if os.path.exists(absdest):
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1914 raise util.Abort(_('%s already exists') % absdest)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	1915
3080 82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1916 if name in q.series:
82c9d1aac308 Make qrename handle directory targets; closes #333. Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	1917 raise util.Abort(_('A patch named %s already exists in the series file') % name)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1918
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1919 if ui.verbose:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1920 ui.write('Renaming %s to %s\n' % (patch, name))
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1921 i = q.find_series(patch)
3685 193e9c6d1a6d Issue424: mq patch loses guard when qrenamed Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3681 diff changeset	1922 guards = q.guard_re.findall(q.full_series[i])
193e9c6d1a6d Issue424: mq patch loses guard when qrenamed Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3681 diff changeset	1923 q.full_series[i] = name + ''.join([' #' + g for g in guards])
2767 60683ab1ed33 mq: rename read_series as parse_series, make simpler and faster Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2766 diff changeset	1924 q.parse_series()
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1925 q.series_dirty = 1
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1926
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1927 info = q.isapplied(patch)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1928 if info:
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	1929 q.applied[info[0]] = statusentry(info[1], name)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1930 q.applied_dirty = 1
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1931
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	1932 util.rename(q.join(patch), absdest)
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1933 r = q.qrepo()
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1934 if r:
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1935 wlock = r.wlock()
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1936 if r.dirstate.state(name) == 'r':
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1937 r.undelete([name], wlock)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1938 r.copy(patch, name, wlock)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1939 r.remove([patch], False, wlock)
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1940
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1941 q.save_dirty()
8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	1942
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1943 def restore(ui, repo, rev, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1944 """restore the queue state saved by a rev"""
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1945 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	1946 q = repo.mq
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1947 q.restore(repo, rev, delete=opts['delete'],
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1948 qupdate=opts['update'])
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1949 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1950 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1951
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1952 def save(ui, repo, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1953 """save current queue state"""
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	1954 q = repo.mq
2804 4b20daa25f15 Update mq to use new logmessage arglist from 2794:bd8a9a94139f Brendan Cully <brendan@kublai.com> parents: 2803 diff changeset	1955 message = commands.logmessage(opts)
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	1956 ret = q.save(repo, msg=message)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1957 if ret:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1958 return ret
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1959 q.save_dirty()
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1960 if opts['copy']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1961 path = q.path
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1962 if opts['name']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1963 newpath = os.path.join(q.basepath, opts['name'])
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1964 if os.path.exists(newpath):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1965 if not os.path.isdir(newpath):
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	1966 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: 2710 diff changeset	1967 'a directory') % newpath)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1968 if not opts['force']:
2711 8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	1969 raise util.Abort(_('destination %s exists, '
8e5cd8d11b51 mq: move many error messages to util.Abort Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2710 diff changeset	1970 'use -f to force') % newpath)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1971 else:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1972 newpath = savename(path)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1973 ui.warn("copy %s to %s\n" % (path, newpath))
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1974 util.copyfiles(path, newpath)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1975 if opts['empty']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1976 try:
2808 766ecdc83e43 mq: add join method Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2807 diff changeset	1977 os.unlink(q.join(q.status_path))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1978 except:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1979 pass
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1980 return 0
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	1981
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1982 def strip(ui, repo, rev, **opts):
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1983 """strip a revision and all later revs on the same branch"""
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1984 rev = repo.lookup(rev)
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1985 backup = 'all'
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1986 if opts['backup']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1987 backup = 'strip'
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1988 elif opts['nobackup']:
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1989 backup = 'none'
3084 fd1479e30aaf mq: do not update an empty working directory after strip. Brendan Cully <brendan@kublai.com> parents: 3083 diff changeset	1990 update = repo.dirstate.parents()[0] != revlog.nullid
fd1479e30aaf mq: do not update an empty working directory after strip. Brendan Cully <brendan@kublai.com> parents: 3083 diff changeset	1991 repo.mq.strip(repo, rev, backup=backup, update=update)
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1992 return 0
7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	1993
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1994 def select(ui, repo, args, *opts):
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1995 '''set or print guarded patches to push
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	1996
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1997 Use the qguard command to set or print guards on patch, then use
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1998 qselect to tell mq which guards to use. A patch will be pushed if it
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	1999 has no guards or any positive guards match the currently selected guard,
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2000 but will not be pushed if any negative guards match the current guard.
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2001 For example:
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2002
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2003 qguard foo.patch -stable (negative guard)
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2004 qguard bar.patch +stable (positive guard)
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2005 qselect stable
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2006
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2007 This activates the "stable" guard. mq will skip foo.patch (because
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2008 it has a negative match) but push bar.patch (because it
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2009 has a positive match).
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2010
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2011 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	2012 With one argument, sets the active guard.
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	2013
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2014 Use -n/--none to deactivate guards (no other arguments needed).
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2015 When no guards are active, patches with positive guards are skipped
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2016 and patches with negative guards are pushed.
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2017
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2018 qselect can change the guards on applied patches. It does not pop
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2019 guarded patches by default. Use --pop to pop back to the last applied
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2020 patch that is not guarded. Use --reapply (which implies --pop) to push
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2021 back to the current patch afterwards, but skip guarded patches.
2832 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2022
2940 b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2023 Use -s/--series to print a list of all guards in the series file (no
b1e6d701a03a mq help text updates and speling fixes Brendan Cully <brendan@kublai.com> parents: 2939 diff changeset	2024 other arguments needed). Use -v for more information.'''
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2025
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2026 q = repo.mq
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2027 guards = q.active()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2028 if args or opts['none']:
2832 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2029 old_unapplied = q.unapplied(repo)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2030 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	2031 not q.pushable(i)[0]]
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2032 q.set_active(args)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2033 q.save_dirty()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2034 if not args:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2035 ui.status(_('guards deactivated\n'))
2832 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2036 if not opts['pop'] and not opts['reapply']:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2037 unapplied = q.unapplied(repo)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2038 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	2039 if not q.pushable(i)[0]]
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2040 if len(unapplied) != len(old_unapplied):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2041 ui.status(_('number of unguarded, unapplied patches has '
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2042 'changed from %d to %d\n') %
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2043 (len(old_unapplied), len(unapplied)))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2044 if len(guarded) != len(old_guarded):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2045 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	2046 'from %d to %d\n') %
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2047 (len(old_guarded), len(guarded)))
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2048 elif opts['series']:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2049 guards = {}
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2050 noguards = 0
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2051 for gs in q.series_guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2052 if not gs:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2053 noguards += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2054 for g in gs:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2055 guards.setdefault(g, 0)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2056 guards[g] += 1
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2057 if ui.verbose:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2058 guards['NONE'] = noguards
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2059 guards = guards.items()
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2060 guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:]))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2061 if guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2062 ui.note(_('guards in series file:\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2063 for guard, count in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2064 ui.note('%2d ' % count)
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2065 ui.write(guard, '\n')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2066 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2067 ui.note(_('no guards in series file\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2068 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2069 if guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2070 ui.note(_('active guards:\n'))
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2071 for g in guards:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2072 ui.write(g, '\n')
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2073 else:
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2074 ui.write(_('no active guards\n'))
2832 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2075 reapply = opts['reapply'] and q.applied and q.appliedname(-1)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2076 popped = False
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2077 if opts['pop'] or opts['reapply']:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2078 for i in xrange(len(q.applied)):
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2079 pushable, reason = q.pushable(i)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2080 if not pushable:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2081 ui.status(_('popping guarded patches\n'))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2082 popped = True
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2083 if i == 0:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2084 q.pop(repo, all=True)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2085 else:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2086 q.pop(repo, i-1)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2087 break
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2088 if popped:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2089 try:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2090 if reapply:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2091 ui.status(_('reapplying unguarded patches\n'))
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2092 q.push(repo, reapply)
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2093 finally:
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2094 q.save_dirty()
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2095
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2096 def reposetup(ui, repo):
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	2097 class mqrepo(repo.__class__):
2836 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2098 def abort_if_wdir_patched(self, errmsg, force=False):
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2099 if self.mq.applied and not force:
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2100 parent = revlog.hex(self.dirstate.parents()[0])
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2101 if parent in [s.rev for s in self.mq.applied]:
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2102 raise util.Abort(errmsg)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	2103
2833 addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2104 def commit(self, args, *opts):
addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2105 if len(args) >= 6:
addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2106 force = args[5]
addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2107 else:
addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2108 force = opts.get('force')
2836 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2109 self.abort_if_wdir_patched(
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2110 _('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: 2833 diff changeset	2111 force)
2833 addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2112
addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2113 return super(mqrepo, self).commit(args, *opts)
addd03c7fbfa Disallow commit over an applied mq patch. Brendan Cully <brendan@kublai.com> parents: 2832 diff changeset	2114
2836 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2115 def push(self, remote, force=False, revs=None):
4039 55578a8d7e84 mq: allow push if -r is given explicitly Brendan Cully <brendan@kublai.com> parents: 4037 diff changeset	2116 if self.mq.applied and not force and not revs:
2836 307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2117 raise util.Abort(_('source has mq patches applied'))
307439d6fede mq: do not allow to push from repo with patches applied Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2833 diff changeset	2118 return super(mqrepo, self).push(remote, force, revs)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3179 diff changeset	2119
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2120 def tags(self):
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2121 if self.tagscache:
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2122 return self.tagscache
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2123
2807 bdc067ff6cf5 Make mq camelcase consistent with the rest of hg. Brendan Cully <brendan@kublai.com> parents: 2805 diff changeset	2124 tagscache = super(mqrepo, self).tags()
2682 4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup. Brendan Cully <brendan@kublai.com> parents: 2677 diff changeset	2125
2724 9c41ae1908c7 mq: replace module-wide repo hash with a repo attribute Brendan Cully <brendan@kublai.com> parents: 2723 diff changeset	2126 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	2127 if not q.applied:
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2128 return tagscache
2663 96950d39171d Mq: modify repo.lookup to resolve applied patches too. Brendan Cully <brendan@kublai.com> parents: 2554 diff changeset	2129
4210 6cb5be6bd70f mq: add qparent tag (first parent of qbase) Brendan Cully <brendan@kublai.com> parents: 4209 diff changeset	2130 mqtags = [(revlog.bin(patch.rev), patch.name) for patch in q.applied]
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2131 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	2132 mqtags.append((mqtags[0][0], 'qbase'))
4210 6cb5be6bd70f mq: add qparent tag (first parent of qbase) Brendan Cully <brendan@kublai.com> parents: 4209 diff changeset	2133 mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent'))
2723 04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2134 for patch in mqtags:
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2135 if patch[1] in tagscache:
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2136 self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1])
04d9b31faeca mq: do not hold a reference to repo in tags override Brendan Cully <brendan@kublai.com> parents: 2720 diff changeset	2137 else:
4210 6cb5be6bd70f mq: add qparent tag (first parent of qbase) Brendan Cully <brendan@kublai.com> parents: 4209 diff changeset	2138 tagscache[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	2139
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup. Brendan Cully <brendan@kublai.com> parents: 2677 diff changeset	2140 return tagscache
2664 9b8df8dceeed Add qtip and qbase to mq qlookup. Brendan Cully <brendan@kublai.com> parents: 2663 diff changeset	2141
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3763 diff changeset	2142 def _branchtags(self):
3486 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2143 q = self.mq
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2144 if not q.applied:
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3763 diff changeset	2145 return super(mqrepo, self)._branchtags()
3486 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2146
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2147 self.branchcache = {} # avoid recursion in changectx
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2148 cl = self.changelog
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2149 partial, last, lrev = self._readbranchcache()
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2150
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2151 qbase = cl.rev(revlog.bin(q.applied[0].rev))
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2152 start = lrev + 1
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2153 if start < qbase:
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2154 # update the cache (excluding the patches) and save it
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2155 self._updatebranchcache(partial, lrev+1, qbase)
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2156 self._writebranchcache(partial, cl.node(qbase-1), qbase-1)
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2157 start = qbase
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2158 # 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: 3468 diff changeset	2159 # 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: 3468 diff changeset	2160 # 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: 3468 diff changeset	2161
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2162 # update the cache up to the tip
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2163 self._updatebranchcache(partial, start, cl.count())
fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2164
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3763 diff changeset	2165 return partial
3486 fbf8320f25c8 make mq play nicely with the branch cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	2166
2839 82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2838 diff changeset	2167 if repo.local():
82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2838 diff changeset	2168 repo.__class__ = mqrepo
82f50658c72b mq: only add mq attribute to local repo Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2838 diff changeset	2169 repo.mq = queue(ui, repo.join(""))
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2170
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2171 seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2172
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2173 cmdtable = {
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2174 "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'),
2720 c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2175 "qclone": (clone,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2176 [('', 'pull', None, _('use pull protocol to copy metadata')),
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2177 ('U', 'noupdate', None, _('do not update the new working directories')),
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2178 ('', 'uncompressed', None,
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2179 _('use uncompressed transfer (fast over LAN)')),
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2180 ('e', 'ssh', '', _('specify ssh command to use')),
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2181 ('p', 'patches', '', _('location of source patch repo')),
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2182 ('', 'remotecmd', '',
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2183 _('specify hg command to run on the remote side'))],
c91ca61c8953 mq: add qclone command Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2712 diff changeset	2184 'hg qclone [OPTION]... SOURCE [DEST]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2185 "qcommit\|qci":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2186 (commit,
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2187 commands.table["^commit\|ci"][1],
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2188 'hg qcommit [OPTION]... [FILE]...'),
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	2189 "^qdiff": (diff,
3697 da262f35fbc8 add --git option to qdiff Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3692 diff changeset	2190 [('g', 'git', None, _('use git extended diff format')),
da262f35fbc8 add --git option to qdiff Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3692 diff changeset	2191 ('I', 'include', [], _('include names matching the given patterns')),
2937 9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	2192 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
9dc568f5e03d Fix test-mq-qdiff; add -I and -X options to qdiff Brendan Cully <brendan@kublai.com> parents: 2936 diff changeset	2193 'hg qdiff [-I] [-X] [FILE]...'),
2889 57b88b86a845 Replace qdel/qfold -f option with -k/--keep. Brendan Cully <brendan@kublai.com> parents: 2882 diff changeset	2194 "qdelete\|qremove\|qrm":
2752 5dfeda163bb7 Add -f option to qdelete, to remove patch file. Brendan Cully <brendan@kublai.com> parents: 2751 diff changeset	2195 (delete,
3371 9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	2196 [('k', 'keep', None, _('keep patch file')),
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	2197 ('r', 'rev', [], _('stop managing a revision'))],
9851f46d6ecc mq: change qdel --forget to --rev; accept any revision symbol Brendan Cully <brendan@kublai.com> parents: 3243 diff changeset	2198 'hg qdelete [-k] [-r REV]... PATCH...'),
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2199 'qfold':
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2200 (fold,
84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2201 [('e', 'edit', None, _('edit patch header')),
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2202 ('k', 'keep', None, _('keep folded patch files'))
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2203 ] + commands.commitopts,
2753 84218111e80f Add -m, -l, -e options to qfold. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2204 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'),
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2205 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')),
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2206 ('n', 'none', None, _('drop all guards'))],
4242 e1cdf5f6386e Fixed synopsis for some mq commands Thomas Arendsen Hein <thomas@intevation.de> parents: 4241 diff changeset	2207 'hg qguard [PATCH] [+GUARD]... [-GUARD]...'),
2747 0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2208 'qheader': (header, [],
0016fc748f61 Add command qheader to display the header of a given patch. Brendan Cully <brendan@kublai.com> parents: 2746 diff changeset	2209 _('hg qheader [PATCH]')),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2210 "^qimport":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2211 (qimport,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2212 [('e', 'existing', None, 'import file in patch dir'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2213 ('n', 'name', '', 'patch file name'),
3141 e21337e06952 mq: Add --rev argument to qimport, to adopt existing changesets. Brendan Cully <brendan@kublai.com> parents: 3128 diff changeset	2214 ('f', 'force', None, 'overwrite existing files'),
3691 79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	2215 ('r', 'rev', [], 'place existing revisions under mq control'),
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	2216 ('g', 'git', None, _('use git extended diff format'))],
79151c94c3b4 mq: add --git option to qimport -r Brendan Cully <brendan@kublai.com> parents: 3685 diff changeset	2217 'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2218 "^qinit":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2219 (init,
2526 37785f986260 mq: Added help for qcommit, consistently talk about queue repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2488 diff changeset	2220 [('c', 'create-repo', None, 'create queue repository')],
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2221 'hg qinit [-c]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2222 "qnew":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2223 (new,
2939 abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	2224 [('e', 'edit', None, _('edit commit message')),
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2225 ('f', 'force', None, _('import uncommitted changes into patch'))
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2226 ] + commands.commitopts,
2939 abd0be815c9c Add qnew -e option. Brendan Cully <brendan@kublai.com> parents: 2938 diff changeset	2227 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'),
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2228 "qnext": (next, [] + seriesopts, 'hg qnext [-s]'),
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2229 "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2230 "^qpop":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2231 (pop,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2232 [('a', 'all', None, 'pop all patches'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2233 ('n', 'name', '', 'queue name to pop'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2234 ('f', 'force', None, 'forget any local changes')],
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2235 'hg qpop [-a] [-n NAME] [-f] [PATCH \| INDEX]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2236 "^qpush":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2237 (push,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2238 [('f', 'force', None, 'apply if the patch has rejects'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2239 ('l', 'list', None, 'list patch name in commit text'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2240 ('a', 'all', None, 'apply all patches'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2241 ('m', 'merge', None, 'merge from another queue'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2242 ('n', 'name', '', 'merge queue name')],
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2243 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH \| INDEX]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2244 "^qrefresh":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2245 (refresh,
2746 0503eb5c0a33 Add option -e/--edit to qrefresh, to edit the existing header. Brendan Cully <brendan@kublai.com> parents: 2745 diff changeset	2246 [('e', 'edit', None, _('edit commit message')),
3083 17747e80ea6c mq: Add --git option to qrefresh Brendan Cully <brendan@kublai.com> parents: 3082 diff changeset	2247 ('g', 'git', None, _('use git extended diff format')),
3690 97d2c1909f98 Make qrefresh help more explanatory for options -m, -l and -s Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3685 diff changeset	2248 ('s', 'short', None, 'refresh only files already in the patch'),
2938 5b7a118f5b6c allow qrefresh to take a list of files; closes #96. Brendan Cully <brendan@kublai.com> parents: 2937 diff changeset	2249 ('I', 'include', [], _('include names matching the given patterns')),
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2250 ('X', 'exclude', [], _('exclude names matching the given patterns'))
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2251 ] + commands.commitopts,
4242 e1cdf5f6386e Fixed synopsis for some mq commands Thomas Arendsen Hein <thomas@intevation.de> parents: 4241 diff changeset	2252 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'),
2751 7d1de4545728 mq: add qmv as alias for qrename Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2750 diff changeset	2253 'qrename\|qmv':
2750 8c814c1ab31e New self-explanatory command qrename. Brendan Cully <brendan@kublai.com> parents: 2748 diff changeset	2254 (rename, [], 'hg qrename PATCH1 [PATCH2]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2255 "qrestore":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2256 (restore,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2257 [('d', 'delete', None, 'delete save entry'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2258 ('u', 'update', None, 'update queue working dir')],
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2259 'hg qrestore [-d] [-u] REV'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2260 "qsave":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2261 (save,
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2262 [('c', 'copy', None, 'copy patch directory'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2263 ('n', 'name', '', 'copy directory name'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2264 ('e', 'empty', None, 'clear queue status file'),
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3823 diff changeset	2265 ('f', 'force', None, 'force copy')] + commands.commitopts,
2694 0fb28dbf0dc7 MQ: uniformise message and logfile option. "Mathieu Clabaut <mathieu.clabaut@gmail.com>" parents: 2682 diff changeset	2266 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'),
2810 2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2267 "qselect": (select,
2e4ace008c94 mq: new commands qselect, qguard Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2808 diff changeset	2268 [('n', 'none', None, _('disable all guards')),
2832 582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2269 ('s', 'series', None, _('list all guards in series file')),
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2270 ('', 'pop', None,
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2271 _('pop to before first guarded applied patch')),
582cbc4392cb qselect: add --pop, --reapply options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	2272 ('', 'reapply', None, _('pop, then reapply patches'))],
4242 e1cdf5f6386e Fixed synopsis for some mq commands Thomas Arendsen Hein <thomas@intevation.de> parents: 4241 diff changeset	2273 'hg qselect [OPTION]... [GUARD]...'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2274 "qseries":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2275 (series,
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2276 [('m', 'missing', None, 'print patches not in series')] + seriesopts,
3082 240ec0e61290 Add the -s option to `hg help qseries`. john.levon@sun.com parents: 3080 diff changeset	2277 'hg qseries [-ms]'),
1810 7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2278 "^strip":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2279 (strip,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2280 [('f', 'force', None, 'force multi-head removal'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2281 ('b', 'backup', None, 'bundle unrelated changesets'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1808 diff changeset	2282 ('n', 'nobackup', None, 'no backups')],
2185 5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 2097 diff changeset	2283 'hg strip [-f] [-b] [-n] REV'),
3176 0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2284 "qtop": (top, [] + seriesopts, 'hg qtop [-s]'),
0e6b58c7beea mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev Brendan Cully <brendan@kublai.com> parents: 3141 diff changeset	2285 "qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'),
1808 7036cd7f770d Add mq extension mason@suse.com parents: diff changeset	2286 }

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/mq.py @ 4430:94cb7561337d