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
|
|
|
|
# GNU General Public License version 2, incorporated herein by reference.
|
2007-08-01 03:28:05 +04:00
|
|
|
|
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
|
|
|
'''interactive change selection during commit or 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
|
2008-03-07 00:23:41 +03:00
|
|
|
import copy, cStringIO, errno, operator, os, re, tempfile
|
2007-08-01 03:28:05 +04:00
|
|
|
|
|
|
|
lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')
|
|
|
|
|
|
|
|
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
|
|
|
|
if line.startswith('diff --git a/'):
|
|
|
|
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
|
|
|
"""
|
2007-08-01 03:28:05 +04:00
|
|
|
diff_re = re.compile('diff --git a/(.*) b/(.*)$')
|
|
|
|
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):
|
|
|
|
for h in self.header:
|
|
|
|
if h.startswith('index '):
|
|
|
|
return True
|
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),
|
|
|
|
sum([h.added + h.removed for h in self.hunks])))
|
|
|
|
break
|
|
|
|
fp.write(h)
|
|
|
|
|
|
|
|
def write(self, fp):
|
|
|
|
fp.write(''.join(self.header))
|
|
|
|
|
|
|
|
def allhunks(self):
|
|
|
|
for h in self.header:
|
|
|
|
if self.allhunks_re.match(h):
|
|
|
|
return True
|
|
|
|
|
|
|
|
def files(self):
|
|
|
|
fromfile, tofile = self.diff_re.match(self.header[0]).groups()
|
|
|
|
if fromfile == tofile:
|
|
|
|
return [fromfile]
|
|
|
|
return [fromfile, tofile]
|
|
|
|
|
|
|
|
def filename(self):
|
|
|
|
return self.files()[-1]
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return '<header %s>' % (' '.join(map(repr, self.files())))
|
|
|
|
|
|
|
|
def special(self):
|
|
|
|
for h in self.header:
|
|
|
|
if self.special_re.match(h):
|
|
|
|
return True
|
|
|
|
|
|
|
|
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):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""patch -> [] 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 = []
|
|
|
|
self.stream = []
|
|
|
|
|
|
|
|
def addrange(self, (fromstart, fromend, tostart, toend, proc)):
|
|
|
|
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.stream.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)
|
|
|
|
self.stream.append(h)
|
|
|
|
self.header = h
|
|
|
|
|
|
|
|
def finished(self):
|
|
|
|
self.addcontext([])
|
|
|
|
return self.stream
|
|
|
|
|
|
|
|
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()
|
|
|
|
|
|
|
|
def filterpatch(ui, chunks):
|
2008-01-10 11:43:30 +03:00
|
|
|
"""Interactively filter patch chunks into applied-only chunks"""
|
2007-08-01 03:28:05 +04:00
|
|
|
chunks = list(chunks)
|
|
|
|
chunks.reverse()
|
|
|
|
seen = {}
|
|
|
|
def consumefile():
|
2008-01-10 11:43:30 +03:00
|
|
|
"""fetch next portion from chunks until a 'header' is seen
|
|
|
|
NB: header == new-file mark
|
|
|
|
"""
|
2007-08-01 03:28:05 +04:00
|
|
|
consumed = []
|
|
|
|
while chunks:
|
|
|
|
if isinstance(chunks[-1], header):
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
consumed.append(chunks.pop())
|
|
|
|
return consumed
|
2008-01-10 11:43:30 +03:00
|
|
|
|
|
|
|
resp_all = [None] # this two are changed from inside prompt,
|
|
|
|
resp_file = [None] # so can't be usual variables
|
|
|
|
applied = {} # 'filename' -> [] of chunks
|
2007-08-10 04:29:16 +04:00
|
|
|
def prompt(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)
|
|
|
|
|
|
|
|
else, input is returned to the caller.
|
|
|
|
"""
|
2007-08-10 04:29:16 +04:00
|
|
|
if resp_all[0] is not None:
|
|
|
|
return resp_all[0]
|
|
|
|
if resp_file[0] is not None:
|
|
|
|
return resp_file[0]
|
|
|
|
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'),
|
|
|
|
_('&?'))
|
|
|
|
r = (ui.prompt("%s %s " % (query, resps), choices)
|
2008-09-09 23:32:39 +04:00
|
|
|
or _('y')).lower()
|
|
|
|
if r == _('?'):
|
|
|
|
doc = gettext(record.__doc__)
|
|
|
|
c = doc.find(_('y - record this change'))
|
|
|
|
for l in doc[c:].splitlines():
|
|
|
|
if l: ui.write(l.strip(), '\n')
|
2007-08-10 04:29:16 +04:00
|
|
|
continue
|
2008-09-09 23:32:39 +04:00
|
|
|
elif r == _('s'):
|
2007-08-10 04:29:16 +04:00
|
|
|
r = resp_file[0] = 'n'
|
2008-09-09 23:32:39 +04:00
|
|
|
elif r == _('f'):
|
2007-08-10 04:29:16 +04:00
|
|
|
r = resp_file[0] = 'y'
|
2008-09-09 23:32:39 +04:00
|
|
|
elif r == _('d'):
|
2007-08-10 04:29:16 +04:00
|
|
|
r = resp_all[0] = 'n'
|
2008-09-09 23:32:39 +04:00
|
|
|
elif r == _('a'):
|
2007-08-10 04:29:16 +04:00
|
|
|
r = resp_all[0] = 'y'
|
2008-09-09 23:32:39 +04:00
|
|
|
elif r == _('q'):
|
2007-08-10 04:29:16 +04:00
|
|
|
raise util.Abort(_('user quit'))
|
|
|
|
return r
|
2009-03-29 01:09:36 +03:00
|
|
|
pos, total = 0, len(chunks) - 1
|
2007-08-01 03:28:05 +04:00
|
|
|
while chunks:
|
|
|
|
chunk = chunks.pop()
|
|
|
|
if isinstance(chunk, header):
|
2008-01-10 11:43:30 +03:00
|
|
|
# new-file mark
|
2007-08-10 04:29:16 +04:00
|
|
|
resp_file = [None]
|
2007-08-01 03:28:05 +04:00
|
|
|
fixoffset = 0
|
|
|
|
hdr = ''.join(chunk.header)
|
|
|
|
if hdr in seen:
|
|
|
|
consumefile()
|
|
|
|
continue
|
|
|
|
seen[hdr] = True
|
2007-08-10 04:29:16 +04:00
|
|
|
if resp_all[0] is None:
|
2007-08-01 03:28:05 +04:00
|
|
|
chunk.pretty(ui)
|
2007-09-06 21:52:54 +04:00
|
|
|
r = prompt(_('examine changes to %s?') %
|
2007-08-10 04:29:16 +04:00
|
|
|
_(' and ').join(map(repr, chunk.files())))
|
2008-09-09 23:32:39 +04:00
|
|
|
if r == _('y'):
|
2007-08-01 03:28:05 +04:00
|
|
|
applied[chunk.filename()] = [chunk]
|
|
|
|
if chunk.allhunks():
|
|
|
|
applied[chunk.filename()] += consumefile()
|
|
|
|
else:
|
|
|
|
consumefile()
|
|
|
|
else:
|
2008-01-10 11:43:30 +03:00
|
|
|
# new hunk
|
2007-08-10 04:29:16 +04:00
|
|
|
if resp_file[0] is None and resp_all[0] is None:
|
2007-08-01 03:28:05 +04:00
|
|
|
chunk.pretty(ui)
|
2009-03-29 01:09:36 +03:00
|
|
|
r = total == 1 and prompt(_('record this change to %r?') %
|
2009-03-29 03:08:33 +04:00
|
|
|
chunk.filename()) \
|
|
|
|
or prompt(_('record change %d/%d to %r?') %
|
|
|
|
(pos, total, chunk.filename()))
|
2008-09-09 23:32:39 +04:00
|
|
|
if r == _('y'):
|
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
|
2009-03-29 01:09:36 +03:00
|
|
|
pos = pos + 1
|
2007-08-01 03:28:05 +04:00
|
|
|
return reduce(operator.add, [h for h in applied.itervalues()
|
|
|
|
if h[0].special() or len(h) > 1], [])
|
|
|
|
|
|
|
|
def record(ui, repo, *pats, **opts):
|
2007-08-10 04:29:16 +04:00
|
|
|
'''interactively select changes to commit
|
|
|
|
|
|
|
|
If a list of files is omitted, all changes reported by "hg status"
|
|
|
|
will be candidates for recording.
|
|
|
|
|
2008-02-22 23:18:48 +03:00
|
|
|
See 'hg help dates' for a list of formats valid for -d/--date.
|
|
|
|
|
2007-08-10 04:29:16 +04:00
|
|
|
You will be prompted for whether to record changes to each
|
|
|
|
modified file, and for files with multiple changes, for each
|
2009-04-04 23:09:43 +04:00
|
|
|
change to use. For each query, the following responses are
|
2007-08-10 04:29:16 +04:00
|
|
|
possible:
|
|
|
|
|
|
|
|
y - record this change
|
|
|
|
n - skip this change
|
|
|
|
|
|
|
|
s - skip remaining changes to this file
|
|
|
|
f - record remaining changes to this file
|
|
|
|
|
|
|
|
d - done, skip remaining changes and files
|
|
|
|
a - record all changes to all remaining files
|
|
|
|
q - quit, recording no changes
|
|
|
|
|
|
|
|
? - display help'''
|
2007-08-01 03:28:05 +04:00
|
|
|
|
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
|
|
|
def record_committer(ui, repo, 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
|
|
|
commands.commit(ui, repo, *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
|
|
|
dorecord(ui, repo, record_committer, *pats, **opts)
|
|
|
|
|
|
|
|
|
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
|
|
|
|
2009-05-10 03:18:38 +04:00
|
|
|
See 'hg help qnew' & 'hg help record' for more information and
|
|
|
|
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"))
|
|
|
|
|
|
|
|
def qrecord_committer(ui, repo, pats, opts):
|
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
|
|
|
|
2008-01-23 21:49:39 +03:00
|
|
|
opts = opts.copy()
|
|
|
|
opts['force'] = True # always 'qnew -f'
|
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
|
|
|
dorecord(ui, repo, qrecord_committer, *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
|
|
|
|
|
|
|
|
|
|
|
def dorecord(ui, repo, committer, *pats, **opts):
|
2009-04-27 01:50:44 +04:00
|
|
|
if not ui.interactive():
|
2007-08-01 03:28:05 +04:00
|
|
|
raise util.Abort(_('running non-interactively, use commit instead'))
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
It's job is to interactively filter local changes, and accordingly
|
|
|
|
prepare working dir into a state, where the job can be delegated to
|
|
|
|
non-interactive commit command such as 'commit' or 'qrefresh'.
|
|
|
|
|
|
|
|
After the actual job is done by non-interactive command, working dir
|
|
|
|
state is restored to original.
|
|
|
|
|
|
|
|
In the end we'll record intresting changes, and everything else will be
|
|
|
|
left in place, so the user can continue his work.
|
|
|
|
"""
|
2009-02-12 13:52:31 +03:00
|
|
|
|
|
|
|
changes = repo.status(match=match)[:3]
|
2007-08-01 03:28:05 +04:00
|
|
|
diffopts = mdiff.diffopts(git=True, nodates=True)
|
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:
|
2009-04-22 02:57:28 +04:00
|
|
|
try: contenders.update(set(h.files()))
|
2007-08-01 03:28:05 +04:00
|
|
|
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
|
2007-08-01 03:28:05 +04:00
|
|
|
backups = {}
|
|
|
|
backupdir = repo.join('record-backups')
|
|
|
|
try:
|
|
|
|
os.mkdir(backupdir)
|
|
|
|
except OSError, err:
|
2007-08-06 23:53:49 +04:00
|
|
|
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
|
2007-08-01 03:28:05 +04:00
|
|
|
for f in newfiles:
|
|
|
|
if f not in modified:
|
|
|
|
continue
|
|
|
|
fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
|
|
|
|
dir=backupdir)
|
|
|
|
os.close(fd)
|
2008-08-31 18:12:03 +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)
|
|
|
|
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:
|
|
|
|
hg.revert(repo, repo.dirstate.parents()[0], backups.has_key)
|
|
|
|
|
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:
|
2008-08-31 18:12:03 +04:00
|
|
|
ui.debug(_('applying patch\n'))
|
2008-08-31 13:36:07 +04:00
|
|
|
ui.debug(fp.getvalue())
|
2009-01-27 18:58:48 +03:00
|
|
|
pfiles = {}
|
|
|
|
patch.internalpatch(fp, ui, 1, repo.root, files=pfiles)
|
|
|
|
patch.updatedir(ui, repo, pfiles)
|
2008-08-31 13:36:07 +04:00
|
|
|
except patch.PatchError, err:
|
|
|
|
s = str(err)
|
|
|
|
if s:
|
|
|
|
raise util.Abort(s)
|
|
|
|
else:
|
|
|
|
raise util.Abort(_('patch failed to apply'))
|
2007-08-01 03:28:05 +04:00
|
|
|
del fp
|
|
|
|
|
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
|
|
|
# 4. We prepared working directory according to filtered patch.
|
|
|
|
# Now is the time to delegate the job to commit/qrefresh or the like!
|
|
|
|
|
|
|
|
# it is important to first chdir to repo root -- we'll call a
|
|
|
|
# highlevel command with list of pathnames relative to repo root
|
|
|
|
cwd = os.getcwd()
|
|
|
|
os.chdir(repo.root)
|
|
|
|
try:
|
|
|
|
committer(ui, repo, newfiles, opts)
|
|
|
|
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():
|
2008-08-31 18:12:03 +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))
|
2007-08-01 03:28:05 +04:00
|
|
|
os.unlink(tmpname)
|
|
|
|
os.rmdir(backupdir)
|
|
|
|
except OSError:
|
|
|
|
pass
|
|
|
|
return cmdutil.commit(ui, repo, recordfunc, pats, opts)
|
|
|
|
|
|
|
|
cmdtable = {
|
2007-08-01 12:42:42 +04:00
|
|
|
"record":
|
|
|
|
(record,
|
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
|
|
|
|
|
|
|
# add commit options
|
|
|
|
commands.table['^commit|ci'][1],
|
|
|
|
|
2007-08-01 12:42:42 +04:00
|
|
|
_('hg record [OPTION]... [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
|
|
|
|
|
|
|
|
|
|
|
def extsetup():
|
|
|
|
try:
|
|
|
|
mq = extensions.find('mq')
|
|
|
|
except KeyError:
|
|
|
|
return
|
|
|
|
|
|
|
|
qcmdtable = {
|
|
|
|
"qrecord":
|
|
|
|
(qrecord,
|
|
|
|
|
2008-01-23 21:49:39 +03:00
|
|
|
# add qnew options, except '--force'
|
|
|
|
[opt for opt in mq.cmdtable['qnew'][1] if opt[1] != 'force'],
|
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
|
|
|
_('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
|
|
|
}
|
|
|
|
|
|
|
|
cmdtable.update(qcmdtable)
|
|
|
|
|