2007-08-01 03:28:05 +04:00
|
|
|
# record.py
|
|
|
|
#
|
|
|
|
# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
|
|
|
|
#
|
2009-04-26 03:08:54 +04:00
|
|
|
# This software may be used and distributed according to the terms of the
|
2010-01-20 07:20:08 +03:00
|
|
|
# GNU General Public License version 2 or any later version.
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2009-06-24 15:42:02 +04:00
|
|
|
'''commands to interactively select changes for commit/qrefresh'''
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2008-09-09 23:32:39 +04:00
|
|
|
from mercurial.i18n import gettext, _
|
2008-03-07 00:23:41 +03:00
|
|
|
from mercurial import cmdutil, commands, extensions, hg, mdiff, patch
|
2007-08-01 03:28:05 +04:00
|
|
|
from mercurial import util
|
2010-12-07 12:03:05 +03:00
|
|
|
import copy, cStringIO, errno, os, re, shutil, tempfile
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2011-05-22 17:10:03 +04:00
|
|
|
cmdtable = {}
|
|
|
|
command = cmdutil.command(cmdtable)
|
|
|
|
|
2007-08-01 03:28:05 +04:00
|
|
|
lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')
|
|
|
|
|
2011-06-10 12:58:10 +04:00
|
|
|
diffopts = [
|
|
|
|
('w', 'ignore-all-space', False,
|
|
|
|
_('ignore white space when comparing lines')),
|
|
|
|
('b', 'ignore-space-change', None,
|
|
|
|
_('ignore changes in the amount of white space')),
|
|
|
|
('B', 'ignore-blank-lines', None,
|
|
|
|
_('ignore changes whose lines are all blank')),
|
|
|
|
]
|
|
|
|
|
2007-08-01 03:28:05 +04:00
|
|
|
def scanpatch(fp):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""like patch.iterhunks, but yield different events
|
|
|
|
|
|
|
|
- ('file', [header_lines + fromfile + tofile])
|
|
|
|
- ('context', [context_lines])
|
|
|
|
- ('hunk', [hunk_lines])
|
|
|
|
- ('range', (-start,len, +start,len, diffp))
|
|
|
|
"""
|
2007-08-01 03:28:05 +04:00
|
|
|
lr = patch.linereader(fp)
|
|
|
|
|
|
|
|
def scanwhile(first, p):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""scan lr while predicate holds"""
|
2007-08-01 03:28:05 +04:00
|
|
|
lines = [first]
|
|
|
|
while True:
|
|
|
|
line = lr.readline()
|
|
|
|
if not line:
|
|
|
|
break
|
|
|
|
if p(line):
|
|
|
|
lines.append(line)
|
|
|
|
else:
|
|
|
|
lr.push(line)
|
|
|
|
break
|
|
|
|
return lines
|
|
|
|
|
|
|
|
while True:
|
|
|
|
line = lr.readline()
|
|
|
|
if not line:
|
|
|
|
break
|
2010-12-09 07:14:18 +03:00
|
|
|
if line.startswith('diff --git a/') or line.startswith('diff -r '):
|
2007-08-01 03:28:05 +04:00
|
|
|
def notheader(line):
|
|
|
|
s = line.split(None, 1)
|
|
|
|
return not s or s[0] not in ('---', 'diff')
|
|
|
|
header = scanwhile(line, notheader)
|
|
|
|
fromfile = lr.readline()
|
|
|
|
if fromfile.startswith('---'):
|
|
|
|
tofile = lr.readline()
|
|
|
|
header += [fromfile, tofile]
|
|
|
|
else:
|
|
|
|
lr.push(fromfile)
|
|
|
|
yield 'file', header
|
|
|
|
elif line[0] == ' ':
|
|
|
|
yield 'context', scanwhile(line, lambda l: l[0] in ' \\')
|
|
|
|
elif line[0] in '-+':
|
|
|
|
yield 'hunk', scanwhile(line, lambda l: l[0] in '-+\\')
|
|
|
|
else:
|
|
|
|
m = lines_re.match(line)
|
|
|
|
if m:
|
|
|
|
yield 'range', m.groups()
|
|
|
|
else:
|
|
|
|
raise patch.PatchError('unknown patch content: %r' % line)
|
|
|
|
|
|
|
|
class header(object):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""patch header
|
2008-03-07 02:24:36 +03:00
|
|
|
|
|
|
|
XXX shoudn't we move this to mercurial/patch.py ?
|
2008-01-10 11:43:30 +03:00
|
|
|
"""
|
2010-12-09 07:14:18 +03:00
|
|
|
diffgit_re = re.compile('diff --git a/(.*) b/(.*)$')
|
|
|
|
diff_re = re.compile('diff -r .* (.*)$')
|
2007-08-01 03:28:05 +04:00
|
|
|
allhunks_re = re.compile('(?:index|new file|deleted file) ')
|
|
|
|
pretty_re = re.compile('(?:new file|deleted file) ')
|
|
|
|
special_re = re.compile('(?:index|new|deleted|copy|rename) ')
|
|
|
|
|
|
|
|
def __init__(self, header):
|
|
|
|
self.header = header
|
|
|
|
self.hunks = []
|
|
|
|
|
|
|
|
def binary(self):
|
2011-01-23 17:21:56 +03:00
|
|
|
return util.any(h.startswith('index ') for h in self.header)
|
2007-08-07 12:28:43 +04:00
|
|
|
|
2007-08-01 03:28:05 +04:00
|
|
|
def pretty(self, fp):
|
|
|
|
for h in self.header:
|
|
|
|
if h.startswith('index '):
|
|
|
|
fp.write(_('this modifies a binary file (all or nothing)\n'))
|
|
|
|
break
|
|
|
|
if self.pretty_re.match(h):
|
|
|
|
fp.write(h)
|
|
|
|
if self.binary():
|
|
|
|
fp.write(_('this is a binary file\n'))
|
|
|
|
break
|
|
|
|
if h.startswith('---'):
|
|
|
|
fp.write(_('%d hunks, %d lines changed\n') %
|
|
|
|
(len(self.hunks),
|
2010-07-22 19:47:46 +04:00
|
|
|
sum([max(h.added, h.removed) for h in self.hunks])))
|
2007-08-01 03:28:05 +04:00
|
|
|
break
|
|
|
|
fp.write(h)
|
|
|
|
|
|
|
|
def write(self, fp):
|
|
|
|
fp.write(''.join(self.header))
|
|
|
|
|
|
|
|
def allhunks(self):
|
2011-01-23 17:21:56 +03:00
|
|
|
return util.any(self.allhunks_re.match(h) for h in self.header)
|
2007-08-01 03:28:05 +04:00
|
|
|
|
|
|
|
def files(self):
|
2010-12-09 07:14:18 +03:00
|
|
|
match = self.diffgit_re.match(self.header[0])
|
|
|
|
if match:
|
|
|
|
fromfile, tofile = match.groups()
|
|
|
|
if fromfile == tofile:
|
|
|
|
return [fromfile]
|
|
|
|
return [fromfile, tofile]
|
|
|
|
else:
|
|
|
|
return self.diff_re.match(self.header[0]).groups()
|
2007-08-01 03:28:05 +04:00
|
|
|
|
|
|
|
def filename(self):
|
|
|
|
return self.files()[-1]
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return '<header %s>' % (' '.join(map(repr, self.files())))
|
|
|
|
|
|
|
|
def special(self):
|
2011-01-23 17:21:56 +03:00
|
|
|
return util.any(self.special_re.match(h) for h in self.header)
|
2007-08-01 03:28:05 +04:00
|
|
|
|
|
|
|
def countchanges(hunk):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""hunk -> (n+,n-)"""
|
2007-08-01 03:28:05 +04:00
|
|
|
add = len([h for h in hunk if h[0] == '+'])
|
|
|
|
rem = len([h for h in hunk if h[0] == '-'])
|
|
|
|
return add, rem
|
|
|
|
|
|
|
|
class hunk(object):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""patch hunk
|
2008-03-07 02:24:36 +03:00
|
|
|
|
2008-01-10 11:43:30 +03:00
|
|
|
XXX shouldn't we merge this with patch.hunk ?
|
|
|
|
"""
|
2007-08-01 03:28:05 +04:00
|
|
|
maxcontext = 3
|
|
|
|
|
|
|
|
def __init__(self, header, fromline, toline, proc, before, hunk, after):
|
|
|
|
def trimcontext(number, lines):
|
|
|
|
delta = len(lines) - self.maxcontext
|
|
|
|
if False and delta > 0:
|
|
|
|
return number + delta, lines[:self.maxcontext]
|
|
|
|
return number, lines
|
|
|
|
|
|
|
|
self.header = header
|
|
|
|
self.fromline, self.before = trimcontext(fromline, before)
|
|
|
|
self.toline, self.after = trimcontext(toline, after)
|
|
|
|
self.proc = proc
|
|
|
|
self.hunk = hunk
|
|
|
|
self.added, self.removed = countchanges(self.hunk)
|
|
|
|
|
|
|
|
def write(self, fp):
|
|
|
|
delta = len(self.before) + len(self.after)
|
2008-08-31 13:34:52 +04:00
|
|
|
if self.after and self.after[-1] == '\\ No newline at end of file\n':
|
|
|
|
delta -= 1
|
2007-08-01 03:28:05 +04:00
|
|
|
fromlen = delta + self.removed
|
|
|
|
tolen = delta + self.added
|
|
|
|
fp.write('@@ -%d,%d +%d,%d @@%s\n' %
|
|
|
|
(self.fromline, fromlen, self.toline, tolen,
|
|
|
|
self.proc and (' ' + self.proc)))
|
|
|
|
fp.write(''.join(self.before + self.hunk + self.after))
|
|
|
|
|
|
|
|
pretty = write
|
|
|
|
|
|
|
|
def filename(self):
|
|
|
|
return self.header.filename()
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return '<hunk %r@%d>' % (self.filename(), self.fromline)
|
|
|
|
|
|
|
|
def parsepatch(fp):
|
2011-01-23 17:21:37 +03:00
|
|
|
"""patch -> [] of headers -> [] of hunks """
|
2007-08-01 03:28:05 +04:00
|
|
|
class parser(object):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""patch parsing state machine"""
|
2007-08-01 03:28:05 +04:00
|
|
|
def __init__(self):
|
|
|
|
self.fromline = 0
|
|
|
|
self.toline = 0
|
|
|
|
self.proc = ''
|
|
|
|
self.header = None
|
|
|
|
self.context = []
|
|
|
|
self.before = []
|
|
|
|
self.hunk = []
|
2011-01-23 17:21:37 +03:00
|
|
|
self.headers = []
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2010-07-02 02:27:03 +04:00
|
|
|
def addrange(self, limits):
|
|
|
|
fromstart, fromend, tostart, toend, proc = limits
|
2007-08-01 03:28:05 +04:00
|
|
|
self.fromline = int(fromstart)
|
|
|
|
self.toline = int(tostart)
|
|
|
|
self.proc = proc
|
|
|
|
|
|
|
|
def addcontext(self, context):
|
|
|
|
if self.hunk:
|
|
|
|
h = hunk(self.header, self.fromline, self.toline, self.proc,
|
|
|
|
self.before, self.hunk, context)
|
|
|
|
self.header.hunks.append(h)
|
|
|
|
self.fromline += len(self.before) + h.removed
|
|
|
|
self.toline += len(self.before) + h.added
|
|
|
|
self.before = []
|
|
|
|
self.hunk = []
|
|
|
|
self.proc = ''
|
|
|
|
self.context = context
|
|
|
|
|
|
|
|
def addhunk(self, hunk):
|
|
|
|
if self.context:
|
|
|
|
self.before = self.context
|
|
|
|
self.context = []
|
2008-08-31 13:34:52 +04:00
|
|
|
self.hunk = hunk
|
2007-08-01 03:28:05 +04:00
|
|
|
|
|
|
|
def newfile(self, hdr):
|
|
|
|
self.addcontext([])
|
|
|
|
h = header(hdr)
|
2011-01-23 17:21:37 +03:00
|
|
|
self.headers.append(h)
|
2007-08-01 03:28:05 +04:00
|
|
|
self.header = h
|
|
|
|
|
|
|
|
def finished(self):
|
|
|
|
self.addcontext([])
|
2011-01-23 17:21:37 +03:00
|
|
|
return self.headers
|
2007-08-01 03:28:05 +04:00
|
|
|
|
|
|
|
transitions = {
|
|
|
|
'file': {'context': addcontext,
|
|
|
|
'file': newfile,
|
|
|
|
'hunk': addhunk,
|
|
|
|
'range': addrange},
|
|
|
|
'context': {'file': newfile,
|
|
|
|
'hunk': addhunk,
|
|
|
|
'range': addrange},
|
|
|
|
'hunk': {'context': addcontext,
|
|
|
|
'file': newfile,
|
|
|
|
'range': addrange},
|
|
|
|
'range': {'context': addcontext,
|
|
|
|
'hunk': addhunk},
|
|
|
|
}
|
2007-08-07 12:28:43 +04:00
|
|
|
|
2007-08-01 03:28:05 +04:00
|
|
|
p = parser()
|
|
|
|
|
|
|
|
state = 'context'
|
|
|
|
for newstate, data in scanpatch(fp):
|
|
|
|
try:
|
|
|
|
p.transitions[state][newstate](p, data)
|
|
|
|
except KeyError:
|
|
|
|
raise patch.PatchError('unhandled transition: %s -> %s' %
|
|
|
|
(state, newstate))
|
|
|
|
state = newstate
|
|
|
|
return p.finished()
|
|
|
|
|
2011-01-23 17:21:37 +03:00
|
|
|
def filterpatch(ui, headers):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""Interactively filter patch chunks into applied-only chunks"""
|
|
|
|
|
2011-01-23 15:01:17 +03:00
|
|
|
def prompt(skipfile, skipall, query):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""prompt query, and process base inputs
|
2008-03-07 02:24:36 +03:00
|
|
|
|
2008-01-10 11:43:30 +03:00
|
|
|
- y/n for the rest of file
|
|
|
|
- y/n for the rest
|
|
|
|
- ? (help)
|
|
|
|
- q (quit)
|
|
|
|
|
2011-01-23 15:01:17 +03:00
|
|
|
Return True/False and possibly updated skipfile and skipall.
|
2008-01-10 11:43:30 +03:00
|
|
|
"""
|
2011-01-23 15:01:17 +03:00
|
|
|
if skipall is not None:
|
|
|
|
return skipall, skipfile, skipall
|
|
|
|
if skipfile is not None:
|
|
|
|
return skipfile, skipfile, skipall
|
2007-08-10 04:29:16 +04:00
|
|
|
while True:
|
2009-04-30 19:15:32 +04:00
|
|
|
resps = _('[Ynsfdaq?]')
|
|
|
|
choices = (_('&Yes, record this change'),
|
|
|
|
_('&No, skip this change'),
|
|
|
|
_('&Skip remaining changes to this file'),
|
|
|
|
_('Record remaining changes to this &file'),
|
|
|
|
_('&Done, skip remaining changes and files'),
|
|
|
|
_('Record &all changes to all remaining files'),
|
|
|
|
_('&Quit, recording no changes'),
|
|
|
|
_('&?'))
|
2009-09-13 04:04:40 +04:00
|
|
|
r = ui.promptchoice("%s %s" % (query, resps), choices)
|
2010-03-15 01:10:52 +03:00
|
|
|
ui.write("\n")
|
2009-06-21 03:13:19 +04:00
|
|
|
if r == 7: # ?
|
2008-09-09 23:32:39 +04:00
|
|
|
doc = gettext(record.__doc__)
|
2010-05-31 15:43:03 +04:00
|
|
|
c = doc.find('::') + 2
|
2008-09-09 23:32:39 +04:00
|
|
|
for l in doc[c:].splitlines():
|
2010-05-31 15:43:03 +04:00
|
|
|
if l.startswith(' '):
|
2010-01-25 09:05:27 +03:00
|
|
|
ui.write(l.strip(), '\n')
|
2007-08-10 04:29:16 +04:00
|
|
|
continue
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 0: # yes
|
2009-11-12 00:53:01 +03:00
|
|
|
ret = True
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 1: # no
|
2009-11-12 00:53:01 +03:00
|
|
|
ret = False
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 2: # Skip
|
2011-01-23 15:01:17 +03:00
|
|
|
ret = skipfile = False
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 3: # file (Record remaining)
|
2011-01-23 15:01:17 +03:00
|
|
|
ret = skipfile = True
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 4: # done, skip remaining
|
2011-01-23 15:01:17 +03:00
|
|
|
ret = skipall = False
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 5: # all
|
2011-01-23 15:01:17 +03:00
|
|
|
ret = skipall = True
|
2009-06-21 03:13:19 +04:00
|
|
|
elif r == 6: # quit
|
2007-08-10 04:29:16 +04:00
|
|
|
raise util.Abort(_('user quit'))
|
2011-01-23 15:01:17 +03:00
|
|
|
return ret, skipfile, skipall
|
|
|
|
|
|
|
|
seen = set()
|
|
|
|
applied = {} # 'filename' -> [] of chunks
|
|
|
|
skipfile, skipall = None, None
|
2011-01-25 01:25:46 +03:00
|
|
|
pos, total = 1, sum(len(h.hunks) for h in headers)
|
2011-01-23 17:21:37 +03:00
|
|
|
for h in headers:
|
2011-01-25 01:25:46 +03:00
|
|
|
pos += len(h.hunks)
|
2011-01-23 17:21:37 +03:00
|
|
|
skipfile = None
|
|
|
|
fixoffset = 0
|
|
|
|
hdr = ''.join(h.header)
|
|
|
|
if hdr in seen:
|
|
|
|
continue
|
|
|
|
seen.add(hdr)
|
|
|
|
if skipall is None:
|
|
|
|
h.pretty(ui)
|
|
|
|
msg = (_('examine changes to %s?') %
|
|
|
|
_(' and ').join(map(repr, h.files())))
|
|
|
|
r, skipfile, skipall = prompt(skipfile, skipall, msg)
|
|
|
|
if not r:
|
|
|
|
continue
|
|
|
|
applied[h.filename()] = [h]
|
|
|
|
if h.allhunks():
|
|
|
|
applied[h.filename()] += h.hunks
|
|
|
|
continue
|
|
|
|
for i, chunk in enumerate(h.hunks):
|
2011-01-23 15:01:17 +03:00
|
|
|
if skipfile is None and skipall is None:
|
2007-08-01 03:28:05 +04:00
|
|
|
chunk.pretty(ui)
|
2011-03-27 14:41:55 +04:00
|
|
|
if total == 1:
|
|
|
|
msg = _('record this change to %r?') % chunk.filename()
|
|
|
|
else:
|
|
|
|
idx = pos - len(h.hunks) + i
|
|
|
|
msg = _('record change %d/%d to %r?') % (idx, total,
|
|
|
|
chunk.filename())
|
2011-01-23 15:01:17 +03:00
|
|
|
r, skipfile, skipall = prompt(skipfile, skipall, msg)
|
2009-11-12 00:53:01 +03:00
|
|
|
if r:
|
2007-08-01 03:28:05 +04:00
|
|
|
if fixoffset:
|
|
|
|
chunk = copy.copy(chunk)
|
|
|
|
chunk.toline += fixoffset
|
|
|
|
applied[chunk.filename()].append(chunk)
|
|
|
|
else:
|
|
|
|
fixoffset += chunk.removed - chunk.added
|
2010-07-02 02:27:03 +04:00
|
|
|
return sum([h for h in applied.itervalues()
|
|
|
|
if h[0].special() or len(h) > 1], [])
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2011-05-22 17:10:03 +04:00
|
|
|
@command("record",
|
2011-06-10 12:58:10 +04:00
|
|
|
# same options as commit + white space diff options
|
|
|
|
commands.table['^commit|ci'][1][:] + diffopts,
|
2011-05-22 17:10:03 +04:00
|
|
|
_('hg record [OPTION]... [FILE]...'))
|
2007-08-01 03:28:05 +04:00
|
|
|
def record(ui, repo, *pats, **opts):
|
2007-08-10 04:29:16 +04:00
|
|
|
'''interactively select changes to commit
|
|
|
|
|
2010-04-22 12:24:49 +04:00
|
|
|
If a list of files is omitted, all changes reported by :hg:`status`
|
2009-07-26 04:00:58 +04:00
|
|
|
will be candidates for recording.
|
2007-08-10 04:29:16 +04:00
|
|
|
|
2010-04-22 12:24:49 +04:00
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
2008-02-22 23:18:48 +03:00
|
|
|
|
2009-07-26 04:00:58 +04:00
|
|
|
You will be prompted for whether to record changes to each
|
|
|
|
modified file, and for files with multiple changes, for each
|
|
|
|
change to use. For each query, the following responses are
|
|
|
|
possible::
|
2007-08-10 04:29:16 +04:00
|
|
|
|
2009-07-17 01:25:26 +04:00
|
|
|
y - record this change
|
|
|
|
n - skip this change
|
2007-08-10 04:29:16 +04:00
|
|
|
|
2009-07-17 01:25:26 +04:00
|
|
|
s - skip remaining changes to this file
|
|
|
|
f - record remaining changes to this file
|
2007-08-10 04:29:16 +04:00
|
|
|
|
2009-07-17 01:25:26 +04:00
|
|
|
d - done, skip remaining changes and files
|
|
|
|
a - record all changes to all remaining files
|
|
|
|
q - quit, recording no changes
|
2007-08-10 04:29:16 +04:00
|
|
|
|
2010-05-31 12:13:15 +04:00
|
|
|
? - display help
|
|
|
|
|
|
|
|
This command is not available when committing a merge.'''
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2011-05-24 20:17:04 +04:00
|
|
|
dorecord(ui, repo, commands.commit, 'commit', False, *pats, **opts)
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
|
2011-10-02 00:47:03 +04:00
|
|
|
def qrefresh(origfn, ui, repo, *pats, **opts):
|
|
|
|
if not opts['interactive']:
|
|
|
|
return origfn(ui, repo, *pats, **opts)
|
|
|
|
|
2011-05-24 20:17:19 +04:00
|
|
|
mq = extensions.find('mq')
|
|
|
|
|
|
|
|
def committomq(ui, repo, *pats, **opts):
|
|
|
|
# At this point the working copy contains only changes that
|
|
|
|
# were accepted. All other changes were reverted.
|
|
|
|
# We can't pass *pats here since qrefresh will undo all other
|
|
|
|
# changed files in the patch that aren't in pats.
|
|
|
|
mq.refresh(ui, repo, **opts)
|
|
|
|
|
|
|
|
# backup all changed files
|
|
|
|
dorecord(ui, repo, committomq, 'qrefresh', True, *pats, **opts)
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
|
2008-01-23 21:49:39 +03:00
|
|
|
def qrecord(ui, repo, patch, *pats, **opts):
|
|
|
|
'''interactively record a new patch
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
|
2010-04-22 12:24:49 +04:00
|
|
|
See :hg:`help qnew` & :hg:`help record` for more information and
|
2009-07-26 04:00:58 +04:00
|
|
|
usage.
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
'''
|
|
|
|
|
|
|
|
try:
|
|
|
|
mq = extensions.find('mq')
|
|
|
|
except KeyError:
|
|
|
|
raise util.Abort(_("'mq' extension not loaded"))
|
|
|
|
|
2011-05-24 20:17:02 +04:00
|
|
|
repo.mq.checkpatchname(patch)
|
|
|
|
|
2010-02-05 20:46:22 +03:00
|
|
|
def committomq(ui, repo, *pats, **opts):
|
2011-05-24 20:17:02 +04:00
|
|
|
opts['checkname'] = False
|
2008-01-23 21:49:39 +03:00
|
|
|
mq.new(ui, repo, patch, *pats, **opts)
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
|
2011-05-24 20:17:04 +04:00
|
|
|
dorecord(ui, repo, committomq, 'qnew', False, *pats, **opts)
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
|
2011-10-02 00:47:03 +04:00
|
|
|
def qnew(origfn, ui, repo, patch, *args, **opts):
|
|
|
|
if opts['interactive']:
|
|
|
|
return qrecord(ui, repo, patch, *args, **opts)
|
|
|
|
return origfn(ui, repo, patch, *args, **opts)
|
|
|
|
|
2011-05-24 20:17:04 +04:00
|
|
|
def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, *pats, **opts):
|
2009-04-27 01:50:44 +04:00
|
|
|
if not ui.interactive():
|
2011-05-22 17:10:02 +04:00
|
|
|
raise util.Abort(_('running non-interactively, use %s instead') %
|
|
|
|
cmdsuggest)
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2008-05-12 20:37:08 +04:00
|
|
|
def recordfunc(ui, repo, message, match, opts):
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
"""This is generic record driver.
|
|
|
|
|
2010-12-22 00:23:48 +03:00
|
|
|
Its job is to interactively filter local changes, and
|
|
|
|
accordingly prepare working directory into a state in which the
|
|
|
|
job can be delegated to a non-interactive commit command such as
|
|
|
|
'commit' or 'qrefresh'.
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
|
2010-12-22 00:23:48 +03:00
|
|
|
After the actual job is done by non-interactive command, the
|
|
|
|
working directory is restored to its original state.
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
|
2010-12-22 00:23:48 +03:00
|
|
|
In the end we'll record interesting changes, and everything else
|
|
|
|
will be left in place, so the user can continue working.
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
"""
|
2009-02-12 13:52:31 +03:00
|
|
|
|
2010-05-31 12:13:15 +04:00
|
|
|
merge = len(repo[None].parents()) > 1
|
|
|
|
if merge:
|
|
|
|
raise util.Abort(_('cannot partially commit a merge '
|
2010-11-21 14:07:06 +03:00
|
|
|
'(use "hg commit" instead)'))
|
2010-05-31 12:13:15 +04:00
|
|
|
|
2009-02-12 13:52:31 +03:00
|
|
|
changes = repo.status(match=match)[:3]
|
2011-06-10 12:58:10 +04:00
|
|
|
diffopts = mdiff.diffopts(git=True, nodates=True,
|
|
|
|
ignorews=opts.get('ignore_all_space'),
|
|
|
|
ignorewsamount=opts.get('ignore_space_change'),
|
|
|
|
ignoreblanklines=opts.get('ignore_blank_lines'))
|
2009-02-12 13:52:31 +03:00
|
|
|
chunks = patch.diff(repo, changes=changes, opts=diffopts)
|
2007-08-01 03:28:05 +04:00
|
|
|
fp = cStringIO.StringIO()
|
2008-11-03 18:48:23 +03:00
|
|
|
fp.write(''.join(chunks))
|
2007-08-01 03:28:05 +04:00
|
|
|
fp.seek(0)
|
|
|
|
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
# 1. filter patch, so we have intending-to apply subset of it
|
2007-08-01 03:28:05 +04:00
|
|
|
chunks = filterpatch(ui, parsepatch(fp))
|
|
|
|
del fp
|
|
|
|
|
2009-04-22 02:57:28 +04:00
|
|
|
contenders = set()
|
2007-08-01 03:28:05 +04:00
|
|
|
for h in chunks:
|
2010-01-25 09:05:27 +03:00
|
|
|
try:
|
|
|
|
contenders.update(set(h.files()))
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
2007-08-07 12:28:43 +04:00
|
|
|
|
2009-02-12 13:52:31 +03:00
|
|
|
changed = changes[0] + changes[1] + changes[2]
|
|
|
|
newfiles = [f for f in changed if f in contenders]
|
2007-08-01 03:28:05 +04:00
|
|
|
if not newfiles:
|
|
|
|
ui.status(_('no changes to record\n'))
|
|
|
|
return 0
|
|
|
|
|
2009-04-22 02:57:28 +04:00
|
|
|
modified = set(changes[0])
|
2007-08-01 03:28:05 +04:00
|
|
|
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
# 2. backup changed files, so we can restore them in the end
|
2011-05-24 20:17:04 +04:00
|
|
|
if backupall:
|
|
|
|
tobackup = changed
|
|
|
|
else:
|
|
|
|
tobackup = [f for f in newfiles if f in modified]
|
|
|
|
|
2007-08-01 03:28:05 +04:00
|
|
|
backups = {}
|
2011-05-24 20:17:04 +04:00
|
|
|
if tobackup:
|
|
|
|
backupdir = repo.join('record-backups')
|
|
|
|
try:
|
|
|
|
os.mkdir(backupdir)
|
|
|
|
except OSError, err:
|
|
|
|
if err.errno != errno.EEXIST:
|
|
|
|
raise
|
2007-08-01 03:28:05 +04:00
|
|
|
try:
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
# backup continues
|
2011-05-24 20:17:04 +04:00
|
|
|
for f in tobackup:
|
2007-08-01 03:28:05 +04:00
|
|
|
fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
|
|
|
|
dir=backupdir)
|
|
|
|
os.close(fd)
|
2009-09-19 03:15:38 +04:00
|
|
|
ui.debug('backup %r as %r\n' % (f, tmpname))
|
2007-08-01 03:28:05 +04:00
|
|
|
util.copyfile(repo.wjoin(f), tmpname)
|
2010-12-07 12:03:05 +03:00
|
|
|
shutil.copystat(repo.wjoin(f), tmpname)
|
2007-08-01 03:28:05 +04:00
|
|
|
backups[f] = tmpname
|
|
|
|
|
|
|
|
fp = cStringIO.StringIO()
|
|
|
|
for c in chunks:
|
|
|
|
if c.filename() in backups:
|
|
|
|
c.write(fp)
|
|
|
|
dopatch = fp.tell()
|
|
|
|
fp.seek(0)
|
|
|
|
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
# 3a. apply filtered patch to clean repo (clean)
|
2007-08-01 03:28:05 +04:00
|
|
|
if backups:
|
2011-04-05 01:21:59 +04:00
|
|
|
hg.revert(repo, repo.dirstate.p1(),
|
2010-07-15 05:58:29 +04:00
|
|
|
lambda key: key in backups)
|
2007-08-01 03:28:05 +04:00
|
|
|
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
# 3b. (apply)
|
2007-08-01 03:28:05 +04:00
|
|
|
if dopatch:
|
2008-08-31 13:36:07 +04:00
|
|
|
try:
|
2009-09-19 03:15:38 +04:00
|
|
|
ui.debug('applying patch\n')
|
2008-08-31 13:36:07 +04:00
|
|
|
ui.debug(fp.getvalue())
|
2011-05-19 01:48:17 +04:00
|
|
|
patch.internalpatch(ui, repo, fp, 1, eolmode=None)
|
2008-08-31 13:36:07 +04:00
|
|
|
except patch.PatchError, err:
|
2010-10-10 00:13:08 +04:00
|
|
|
raise util.Abort(str(err))
|
2007-08-01 03:28:05 +04:00
|
|
|
del fp
|
|
|
|
|
2010-12-22 00:23:48 +03:00
|
|
|
# 4. We prepared working directory according to filtered
|
|
|
|
# patch. Now is the time to delegate the job to
|
|
|
|
# commit/qrefresh or the like!
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
|
2010-12-22 00:23:48 +03:00
|
|
|
# it is important to first chdir to repo root -- we'll call
|
|
|
|
# a highlevel command with list of pathnames relative to
|
|
|
|
# repo root
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
cwd = os.getcwd()
|
|
|
|
os.chdir(repo.root)
|
|
|
|
try:
|
2010-02-05 20:46:22 +03:00
|
|
|
commitfunc(ui, repo, *newfiles, **opts)
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
finally:
|
|
|
|
os.chdir(cwd)
|
|
|
|
|
2007-08-01 03:28:05 +04:00
|
|
|
return 0
|
|
|
|
finally:
|
record: refactor record into generic record driver
rationale
---------
I'd like to make MQ version of record -- qrecord.
>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().
As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.
Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.
Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'
So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.
'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
|
|
|
# 5. finally restore backed-up files
|
2007-08-01 03:28:05 +04:00
|
|
|
try:
|
|
|
|
for realname, tmpname in backups.iteritems():
|
2009-09-19 03:15:38 +04:00
|
|
|
ui.debug('restoring %r to %r\n' % (tmpname, realname))
|
2007-08-06 23:53:17 +04:00
|
|
|
util.copyfile(tmpname, repo.wjoin(realname))
|
2010-12-07 12:03:05 +03:00
|
|
|
# Our calls to copystat() here and above are a
|
|
|
|
# hack to trick any editors that have f open that
|
|
|
|
# we haven't modified them.
|
|
|
|
#
|
|
|
|
# Also note that this racy as an editor could
|
|
|
|
# notice the file's mtime before we've finished
|
|
|
|
# writing it.
|
|
|
|
shutil.copystat(tmpname, repo.wjoin(realname))
|
2007-08-01 03:28:05 +04:00
|
|
|
os.unlink(tmpname)
|
2011-05-24 20:17:04 +04:00
|
|
|
if tobackup:
|
|
|
|
os.rmdir(backupdir)
|
2007-08-01 03:28:05 +04:00
|
|
|
except OSError:
|
|
|
|
pass
|
2010-04-03 00:22:15 +04:00
|
|
|
|
|
|
|
# wrap ui.write so diff output can be labeled/colorized
|
|
|
|
def wrapwrite(orig, *args, **kw):
|
|
|
|
label = kw.pop('label', '')
|
|
|
|
for chunk, l in patch.difflabel(lambda: args):
|
|
|
|
orig(chunk, label=label + l)
|
|
|
|
oldwrite = ui.write
|
|
|
|
extensions.wrapfunction(ui, 'write', wrapwrite)
|
|
|
|
try:
|
|
|
|
return cmdutil.commit(ui, repo, recordfunc, pats, opts)
|
|
|
|
finally:
|
|
|
|
ui.write = oldwrite
|
2007-08-01 03:28:05 +04:00
|
|
|
|
2011-05-22 17:10:03 +04:00
|
|
|
cmdtable["qrecord"] = \
|
2011-05-26 20:00:47 +04:00
|
|
|
(qrecord, [], # placeholder until mq is available
|
2011-05-22 17:10:03 +04:00
|
|
|
_('hg qrecord [OPTION]... PATCH [FILE]...'))
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
|
2009-11-05 03:10:43 +03:00
|
|
|
def uisetup(ui):
|
hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.
Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.
After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::
As it is now, there is no way to put part of the changes into one patch,
and another part of the changes into second patch.
This works, but only when changes are touching separate files, and for
semantically different changes touching the same file(s) there is now
pretty way to put them into separate patches.
For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.
So, here is the first step towards untiing the problem:
Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
|
|
|
try:
|
|
|
|
mq = extensions.find('mq')
|
|
|
|
except KeyError:
|
|
|
|
return
|
|
|
|
|
2011-05-22 17:10:03 +04:00
|
|
|
cmdtable["qrecord"] = \
|
2011-05-24 20:17:22 +04:00
|
|
|
(qrecord,
|
|
|
|
# same options as qnew, but copy them so we don't get
|
2011-06-10 12:58:10 +04:00
|
|
|
# -i/--interactive for qrecord and add white space diff options
|
|
|
|
mq.cmdtable['^qnew'][1][:] + diffopts,
|
2011-05-22 17:10:03 +04:00
|
|
|
_('hg qrecord [OPTION]... PATCH [FILE]...'))
|
2011-05-24 20:17:19 +04:00
|
|
|
|
2011-10-02 00:47:03 +04:00
|
|
|
_wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch"))
|
2011-05-24 20:17:19 +04:00
|
|
|
_wrapcmd('qrefresh', mq.cmdtable, qrefresh,
|
|
|
|
_("interactively select changes to refresh"))
|
|
|
|
|
|
|
|
def _wrapcmd(cmd, table, wrapfn, msg):
|
2011-10-02 00:47:03 +04:00
|
|
|
entry = extensions.wrapcommand(table, cmd, wrapfn)
|
2011-05-24 20:17:19 +04:00
|
|
|
entry[1].append(('i', 'interactive', None, msg))
|