record: check that we are not committing a merge before patch selection

It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.

hgext/record.py

@@ -1,552 +1,559
 # record.py
 #
 # Copyright 2007 Bryan O'Sullivan <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''commands to interactively select changes for commit/qrefresh'''
 
 from mercurial.i18n import gettext, _
 from mercurial import cmdutil, commands, extensions, hg, mdiff, patch
 from mercurial import util
 import copy, cStringIO, errno, operator, os, re, tempfile
 
 lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')
 
 def scanpatch(fp):
     """like patch.iterhunks, but yield different events
 
     - ('file',    [header_lines + fromfile + tofile])
     - ('context', [context_lines])
     - ('hunk',    [hunk_lines])
     - ('range',   (-start,len, +start,len, diffp))
     """
     lr = patch.linereader(fp)
 
     def scanwhile(first, p):
         """scan lr while predicate holds"""
         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):
     """patch header
 
     XXX shoudn't we move this to mercurial/patch.py ?
     """
     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
 
     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):
     """hunk -> (n+,n-)"""
     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):
     """patch hunk
 
     XXX shouldn't we merge this with patch.hunk ?
     """
     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)
         if self.after and self.after[-1] == '\\ No newline at end of file\n':
             delta -= 1
         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):
     """patch -> [] of hunks """
     class parser(object):
         """patch parsing state machine"""
         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 = []
             self.hunk = hunk
 
         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},
             }
 
     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):
     """Interactively filter patch chunks into applied-only chunks"""
     chunks = list(chunks)
     chunks.reverse()
     seen = set()
     def consumefile():
         """fetch next portion from chunks until a 'header' is seen
         NB: header == new-file mark
         """
         consumed = []
         while chunks:
             if isinstance(chunks[-1], header):
                 break
             else:
                 consumed.append(chunks.pop())
         return consumed
 
     resp_all = [None]   # this two are changed from inside prompt,
     resp_file = [None]  # so can't be usual variables
     applied = {}        # 'filename' -> [] of chunks
     def prompt(query):
         """prompt query, and process base inputs
 
         - y/n for the rest of file
         - y/n for the rest
         - ? (help)
         - q (quit)
 
         Returns True/False and sets reps_all and resp_file as
         appropriate.
         """
         if resp_all[0] is not None:
             return resp_all[0]
         if resp_file[0] is not None:
             return resp_file[0]
         while True:
             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.promptchoice("%s %s" % (query, resps), choices)
             if r == 7: # ?
                 doc = gettext(record.__doc__)
                 c = doc.find('::') + 2
                 for l in doc[c:].splitlines():
                     if l.startswith('      '):
                         ui.write(l.strip(), '\n')
                 continue
             elif r == 0: # yes
                 ret = True
             elif r == 1: # no
                 ret = False
             elif r == 2: # Skip
                 ret = resp_file[0] = False
             elif r == 3: # file (Record remaining)
                 ret = resp_file[0] = True
             elif r == 4: # done, skip remaining
                 ret = resp_all[0] = False
             elif r == 5: # all
                 ret = resp_all[0] = True
             elif r == 6: # quit
                 raise util.Abort(_('user quit'))
             return ret
     pos, total = 0, len(chunks) - 1
     while chunks:
         pos = total - len(chunks) + 1
         chunk = chunks.pop()
         if isinstance(chunk, header):
             # new-file mark
             resp_file = [None]
             fixoffset = 0
             hdr = ''.join(chunk.header)
             if hdr in seen:
                 consumefile()
                 continue
             seen.add(hdr)
             if resp_all[0] is None:
                 chunk.pretty(ui)
             r = prompt(_('examine changes to %s?') %
                        _(' and ').join(map(repr, chunk.files())))
             if r:
                 applied[chunk.filename()] = [chunk]
                 if chunk.allhunks():
                     applied[chunk.filename()] += consumefile()
             else:
                 consumefile()
         else:
             # new hunk
             if resp_file[0] is None and resp_all[0] is None:
                 chunk.pretty(ui)
             r = total == 1 and prompt(_('record this change to %r?') %
                                       chunk.filename()) \
                            or  prompt(_('record change %d/%d to %r?') %
                                       (pos, total, chunk.filename()))
             if r:
                 if fixoffset:
                     chunk = copy.copy(chunk)
                     chunk.toline += fixoffset
                 applied[chunk.filename()].append(chunk)
             else:
                 fixoffset += chunk.removed - chunk.added
     return reduce(operator.add, [h for h in applied.itervalues()
                                  if h[0].special() or len(h) > 1], [])
 
 def record(ui, repo, *pats, **opts):
     '''interactively select changes to commit
 
     If a list of files is omitted, all changes reported by "hg status"
     will be candidates for recording.
 
     See 'hg help dates' for a list of formats valid for -d/--date.
 
     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::
 
       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'''
+      ? - display help
+
+    This command is not available when committing a merge.'''
 
     dorecord(ui, repo, commands.commit, *pats, **opts)
 
 
 def qrecord(ui, repo, patch, *pats, **opts):
     '''interactively record a new patch
 
     See 'hg help qnew' & 'hg help record' for more information and
     usage.
     '''
 
     try:
         mq = extensions.find('mq')
     except KeyError:
         raise util.Abort(_("'mq' extension not loaded"))
 
     def committomq(ui, repo, *pats, **opts):
         mq.new(ui, repo, patch, *pats, **opts)
 
     opts = opts.copy()
     opts['force'] = True    # always 'qnew -f'
     dorecord(ui, repo, committomq, *pats, **opts)
 
 
 def dorecord(ui, repo, commitfunc, *pats, **opts):
     if not ui.interactive():
         raise util.Abort(_('running non-interactively, use commit instead'))
 
     def recordfunc(ui, repo, message, match, opts):
         """This is generic record driver.
 
         Its 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 interesting changes, and everything else will be
         left in place, so the user can continue his work.
         """
 
+        merge = len(repo[None].parents()) > 1
+        if merge:
+            raise util.Abort(_('cannot partially commit a merge '
+                               '(use hg commit instead)'))
+
         changes = repo.status(match=match)[:3]
         diffopts = mdiff.diffopts(git=True, nodates=True)
         chunks = patch.diff(repo, changes=changes, opts=diffopts)
         fp = cStringIO.StringIO()
         fp.write(''.join(chunks))
         fp.seek(0)
 
         # 1. filter patch, so we have intending-to apply subset of it
         chunks = filterpatch(ui, parsepatch(fp))
         del fp
 
         contenders = set()
         for h in chunks:
             try:
                 contenders.update(set(h.files()))
             except AttributeError:
                 pass
 
         changed = changes[0] + changes[1] + changes[2]
         newfiles = [f for f in changed if f in contenders]
         if not newfiles:
             ui.status(_('no changes to record\n'))
             return 0
 
         modified = set(changes[0])
 
         # 2. backup changed files, so we can restore them in the end
         backups = {}
         backupdir = repo.join('record-backups')
         try:
             os.mkdir(backupdir)
         except OSError, err:
             if err.errno != errno.EEXIST:
                 raise
         try:
             # backup continues
             for f in newfiles:
                 if f not in modified:
                     continue
                 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
                                                dir=backupdir)
                 os.close(fd)
                 ui.debug('backup %r as %r\n' % (f, tmpname))
                 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)
 
             # 3a. apply filtered patch to clean repo  (clean)
             if backups:
                 hg.revert(repo, repo.dirstate.parents()[0], backups.has_key)
 
             # 3b. (apply)
             if dopatch:
                 try:
                     ui.debug('applying patch\n')
                     ui.debug(fp.getvalue())
                     pfiles = {}
                     patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
                                         eolmode=None)
                     patch.updatedir(ui, repo, pfiles)
                 except patch.PatchError, err:
                     s = str(err)
                     if s:
                         raise util.Abort(s)
                     else:
                         raise util.Abort(_('patch failed to apply'))
             del fp
 
             # 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:
                 commitfunc(ui, repo, *newfiles, **opts)
             finally:
                 os.chdir(cwd)
 
             return 0
         finally:
             # 5. finally restore backed-up files
             try:
                 for realname, tmpname in backups.iteritems():
                     ui.debug('restoring %r to %r\n' % (tmpname, realname))
                     util.copyfile(tmpname, repo.wjoin(realname))
                     os.unlink(tmpname)
                 os.rmdir(backupdir)
             except OSError:
                 pass
     return cmdutil.commit(ui, repo, recordfunc, pats, opts)
 
 cmdtable = {
     "record":
         (record,
 
          # add commit options
          commands.table['^commit|ci'][1],
 
          _('hg record [OPTION]... [FILE]...')),
 }
 
 
 def uisetup(ui):
     try:
         mq = extensions.find('mq')
     except KeyError:
         return
 
     qcmdtable = {
     "qrecord":
         (qrecord,
 
          # add qnew options, except '--force'
          [opt for opt in mq.cmdtable['qnew'][1] if opt[1] != 'force'],
 
          _('hg qrecord [OPTION]... PATCH [FILE]...')),
     }
 
     cmdtable.update(qcmdtable)
 

tests/test-record

@@ -1,318 +1,329
 #!/bin/sh
 
 echo "[ui]" >> $HGRCPATH
 echo "interactive=true" >> $HGRCPATH
 echo "[extensions]" >> $HGRCPATH
 echo "record=" >> $HGRCPATH
 
 echo % help
 
 hg help record
 
 hg init a
 cd a
 
 echo % select no files
 
 touch empty-rw
 hg add empty-rw
 hg record empty-rw<<EOF
 n
 EOF
 echo; hg tip -p
 
 echo % select files but no hunks
 
 hg record empty-rw<<EOF
 y
 n
 EOF
 echo; hg tip -p
 
 echo % record empty file
 
 hg record -d '0 0' -m empty empty-rw<<EOF
 y
 y
 EOF
 echo; hg tip -p
 
 echo % rename empty file
 
 hg mv empty-rw empty-rename
 hg record -d '1 0' -m rename<<EOF
 y
 EOF
 echo; hg tip -p
 
 echo % copy empty file
 
 hg cp empty-rename empty-copy
 hg record -d '2 0' -m copy<<EOF
 y
 EOF
 echo; hg tip -p
 
 echo % delete empty file
 
 hg rm empty-copy
 hg record -d '3 0' -m delete<<EOF
 y
 EOF
 echo; hg tip -p
 
 echo % add binary file
 
 hg bundle --base -2 tip.bundle
 hg add tip.bundle
 hg record -d '4 0' -m binary<<EOF
 y
 EOF
 echo; hg tip -p
 
 echo % change binary file
 
 hg bundle --base -2 tip.bundle
 hg record -d '5 0' -m binary-change<<EOF
 y
 EOF
 echo; hg tip -p
 
 echo % rename and change binary file
 
 hg mv tip.bundle top.bundle
 hg bundle --base -2 top.bundle
 hg record -d '6 0' -m binary-change-rename<<EOF
 y
 EOF
 echo; hg tip -p
 
 echo % add plain file
 
 for i in 1 2 3 4 5 6 7 8 9 10; do
     echo $i >> plain
 done
 
 hg add plain
 hg record -d '7 0' -m plain plain<<EOF
 y
 y
 EOF
 echo; hg tip -p
 
 echo % modify end of plain file
 
 echo 11 >> plain
 hg record -d '8 0' -m end plain <<EOF
 y
 y
 EOF
 
 echo % modify end of plain file, no EOL
 
 hg tip --template '{node}' >> plain
 hg record -d '9 0' -m noeol plain <<EOF
 y
 y
 EOF
 
 echo % modify end of plain file, add EOL
 
 echo >> plain
 hg record -d '10 0' -m eol plain <<EOF
 y
 y
 y
 EOF
 
 echo % modify beginning, trim end, record both
 
 rm plain
 for i in 2 2 3 4 5 6 7 8 9 10; do
   echo $i >> plain
 done
 
 hg record -d '10 0' -m begin-and-end plain <<EOF
 y
 y
 y
 EOF
 echo; hg tip -p
 
 echo % trim beginning, modify end
 
 rm plain
 for i in 4 5 6 7 8 9 10.new; do
   echo $i >> plain
 done
 
 echo % record end
 
 hg record -d '11 0' -m end-only plain <<EOF
 y
 n
 y
 EOF
 echo; hg tip -p
 
 echo % record beginning
 
 hg record -d '12 0' -m begin-only plain <<EOF
 y
 y
 EOF
 echo; hg tip -p
 
 echo % add to beginning, trim from end
 
 rm plain
 for i in 1 2 3 4 5 6 7 8 9; do
   echo $i >> plain
 done
 
 echo % record end
 
 hg record --traceback -d '13 0' -m end-again plain<<EOF
 y
 n
 y
 EOF
 
 echo % add to beginning, middle, end
 
 rm plain
 for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do
   echo $i >> plain
 done
 
 echo % record beginning, middle
 
 hg record -d '14 0' -m middle-only plain <<EOF
 y
 y
 y
 n
 EOF
 echo; hg tip -p
 
 echo % record end
 
 hg record -d '15 0' -m end-only plain <<EOF
 y
 y
 EOF
 echo; hg tip -p
 
 mkdir subdir
 cd subdir
 echo a > a
 hg ci -d '16 0' -Amsubdir
 
 echo a >> a
 hg record -d '16 0' -m subdir-change a <<EOF
 y
 y
 EOF
 echo; hg tip -p
 
 echo a > f1
 echo b > f2
 hg add f1 f2
 
 hg ci -mz -d '17 0'
 
 echo a >> f1
 echo b >> f2
 
 echo % help, quit
 
 hg record <<EOF
 ?
 q
 EOF
 
 echo % skip
 
 hg record <<EOF
 s
 EOF
 
 echo % no
 
 hg record <<EOF
 n
 EOF
 
 echo % f, quit
 
 hg record <<EOF
 f
 q
 EOF
 
 echo % s, all
 
 hg record -d '18 0' -mx <<EOF
 s
 a
 EOF
 echo; hg tip -p
 
 echo % f
 
 hg record -d '19 0' -my <<EOF
 f
 EOF
 echo; hg tip -p
 
 echo % preserve chmod +x
 
 chmod +x f1
 echo a >> f1
 hg record -d '20 0' -mz <<EOF
 y
 y
 y
 EOF
 echo; hg tip --config diff.git=True -p
 
 echo % preserve execute permission on original
 
 echo b >> f1
 hg record -d '21 0' -maa <<EOF
 y
 y
 y
 EOF
 echo; hg tip --config diff.git=True -p
 
 echo % preserve chmod -x
 
 chmod -x f1
 echo c >> f1
 hg record -d '22 0' -mab <<EOF
 y
 y
 y
 EOF
 echo; hg tip --config diff.git=True -p
 
+cd ..
+
+echo % abort early when a merge is in progress
+hg up 4
+touch iwillmergethat
+hg add iwillmergethat
+hg branch thatbranch
+hg ci -m'new head'
+hg up default
+hg merge thatbranch
+echo; hg record -m'will abort'
+hg up -C
 
 echo % with win32ext
-cd ..
 echo '[extensions]' >> .hg/hgrc
 echo 'win32text = ' >> .hg/hgrc
 echo '[decode]' >> .hg/hgrc
 echo '** = cleverdecode:' >> .hg/hgrc
 echo '[encode]' >> .hg/hgrc
 echo '** = cleverencode:' >> .hg/hgrc
 echo '[patch]' >> .hg/hgrc
 echo 'eol = crlf' >> .hg/hgrc
 
 echo d >> subdir/f1
 hg record -d '23 0' -mw1 <<EOF
 y
 y
 EOF
 echo; hg tip -p
 

tests/test-record.out

@@ -1,595 +1,608
 % help
 hg record [OPTION]... [FILE]...
 
 interactively select changes to commit
 
     If a list of files is omitted, all changes reported by "hg status" will be
     candidates for recording.
 
     See 'hg help dates' for a list of formats valid for -d/--date.
 
     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:
 
       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
 
+    This command is not available when committing a merge.
+
 options:
 
  -A --addremove     mark new/missing files as added/removed before committing
     --close-branch  mark a branch as closed, hiding it from the branch list
  -I --include       include names matching the given patterns
  -X --exclude       exclude names matching the given patterns
  -m --message       use <text> as commit message
  -l --logfile       read commit message from <file>
  -d --date          record datecode as commit date
  -u --user          record the specified user as committer
 
 use "hg -v help record" to show global options
 % select no files
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record
 
 changeset:   -1:000000000000
 tag:         tip
 user:        
 date:        Thu Jan 01 00:00:00 1970 +0000
 
 
 % select files but no hunks
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?] abort: empty commit message
 
 changeset:   -1:000000000000
 tag:         tip
 user:        
 date:        Thu Jan 01 00:00:00 1970 +0000
 
 
 % record empty file
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?] 
 changeset:   0:c0708cf4e46e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     empty
 
 
 % rename empty file
 diff --git a/empty-rw b/empty-rename
 rename from empty-rw
 rename to empty-rename
 examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] 
 changeset:   1:d695e8dcb197
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     rename
 
 
 % copy empty file
 diff --git a/empty-rename b/empty-copy
 copy from empty-rename
 copy to empty-copy
 examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] 
 changeset:   2:1d4b90bea524
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     copy
 
 
 % delete empty file
 diff --git a/empty-copy b/empty-copy
 deleted file mode 100644
 examine changes to 'empty-copy'? [Ynsfdaq?] 
 changeset:   3:b39a238f01a1
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     delete
 
 
 % add binary file
 1 changesets found
 diff --git a/tip.bundle b/tip.bundle
 new file mode 100644
 this is a binary file
 examine changes to 'tip.bundle'? [Ynsfdaq?] 
 changeset:   4:ad816da3711e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     binary
 
 diff -r b39a238f01a1 -r ad816da3711e tip.bundle
 Binary file tip.bundle has changed
 
 % change binary file
 1 changesets found
 diff --git a/tip.bundle b/tip.bundle
 this modifies a binary file (all or nothing)
 examine changes to 'tip.bundle'? [Ynsfdaq?] 
 changeset:   5:dccd6f3eb485
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 summary:     binary-change
 
 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
 Binary file tip.bundle has changed
 
 % rename and change binary file
 1 changesets found
 diff --git a/tip.bundle b/top.bundle
 rename from tip.bundle
 rename to top.bundle
 this modifies a binary file (all or nothing)
 examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] 
 changeset:   6:7fa44105f5b3
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:06 1970 +0000
 summary:     binary-change-rename
 
 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
 Binary file tip.bundle has changed
 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
 Binary file top.bundle has changed
 
 % add plain file
 diff --git a/plain b/plain
 new file mode 100644
 examine changes to 'plain'? [Ynsfdaq?] 
 changeset:   7:11fb457c1be4
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:07 1970 +0000
 summary:     plain
 
 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:07 1970 +0000
 @@ -0,0 +1,10 @@
 +1
 +2
 +3
 +4
 +5
 +6
 +7
 +8
 +9
 +10
 
 % modify end of plain file
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@
  8
  9
  10
 +11
 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@
  9
  10
  11
 +7264f99c5f5ff3261504828afa4fb4d406c3af54
 \ No newline at end of file
 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@
  9
  10
  11
 -7264f99c5f5ff3261504828afa4fb4d406c3af54
 \ No newline at end of file
 +7264f99c5f5ff3261504828afa4fb4d406c3af54
 record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@
 -1
 +2
  2
  3
  4
 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@
  8
  9
  10
 -11
 -7264f99c5f5ff3261504828afa4fb4d406c3af54
 record change 2/2 to 'plain'? [Ynsfdaq?] 
 changeset:   11:efca65c9b09e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:10 1970 +0000
 summary:     begin-and-end
 
 diff -r cd07d48e8cbe -r efca65c9b09e plain
 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
 @@ -1,4 +1,4 @@
 -1
 +2
  2
  3
  4
 @@ -8,5 +8,3 @@
  8
  9
  10
 -11
 -7264f99c5f5ff3261504828afa4fb4d406c3af54
 
 % trim beginning, modify end
 % record end
 diff --git a/plain b/plain
 2 hunks, 5 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@
 -2
 -2
 -3
  4
  5
  6
  7
  8
  9
 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@
  4
  5
  6
  7
  8
  9
 -10
 +10.new
 record change 2/2 to 'plain'? [Ynsfdaq?] 
 changeset:   12:7d1e66983c15
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:11 1970 +0000
 summary:     end-only
 
 diff -r efca65c9b09e -r 7d1e66983c15 plain
 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
 @@ -7,4 +7,4 @@
  7
  8
  9
 -10
 +10.new
 
 % record beginning
 diff --git a/plain b/plain
 1 hunks, 3 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@
 -2
 -2
 -3
  4
  5
  6
 record this change to 'plain'? [Ynsfdaq?] 
 changeset:   13:a09fc62a0e61
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:12 1970 +0000
 summary:     begin-only
 
 diff -r 7d1e66983c15 -r a09fc62a0e61 plain
 --- a/plain	Thu Jan 01 00:00:11 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
 @@ -1,6 +1,3 @@
 -2
 -2
 -3
  4
  5
  6
 
 % add to beginning, trim from end
 % record end
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@
 +1
 +2
 +3
  4
  5
  6
  7
  8
  9
 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@
  4
  5
  6
  7
  8
  9
 -10.new
 record change 2/2 to 'plain'? [Ynsfdaq?] % add to beginning, middle, end
 % record beginning, middle
 diff --git a/plain b/plain
 3 hunks, 7 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@
 +1
 +2
 +3
  4
  5
 record change 1/3 to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@
  4
  5
 +5.new
 +5.reallynew
  6
  7
  8
  9
 record change 2/3 to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@
  6
  7
  8
  9
 +10
 +11
 record change 3/3 to 'plain'? [Ynsfdaq?] 
 changeset:   15:7d137997f3a6
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:14 1970 +0000
 summary:     middle-only
 
 diff -r c0b8e5fb0be6 -r 7d137997f3a6 plain
 --- a/plain	Thu Jan 01 00:00:13 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
 @@ -1,5 +1,10 @@
 +1
 +2
 +3
  4
  5
 +5.new
 +5.reallynew
  6
  7
  8
 
 % record end
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@
  7
  8
  9
 +10
 +11
 record this change to 'plain'? [Ynsfdaq?] 
 changeset:   16:4959e3ff13eb
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:15 1970 +0000
 summary:     end-only
 
 diff -r 7d137997f3a6 -r 4959e3ff13eb plain
 --- a/plain	Thu Jan 01 00:00:14 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
 @@ -9,3 +9,5 @@
  7
  8
  9
 +10
 +11
 
 adding subdir/a
 diff --git a/subdir/a b/subdir/a
 1 hunks, 1 lines changed
 examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@
  a
 +a
 record this change to 'subdir/a'? [Ynsfdaq?] 
 changeset:   18:40698cd490b2
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:16 1970 +0000
 summary:     subdir-change
 
 diff -r 661eacdc08b9 -r 40698cd490b2 subdir/a
 --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 @@ -1,1 +1,2 @@
  a
 +a
 
 % help, quit
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] 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
 examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit
 % skip
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
 % no
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
 % f, quit
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit
 % s, all
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] 
 changeset:   20:d2d8c25276a8
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:18 1970 +0000
 summary:     x
 
 diff -r 25eb2a7694fb -r d2d8c25276a8 subdir/f2
 --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
 +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
 @@ -1,1 +1,2 @@
  b
 +b
 
 % f
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] 
 changeset:   21:1013f51ce32f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:19 1970 +0000
 summary:     y
 
 diff -r d2d8c25276a8 -r 1013f51ce32f subdir/f1
 --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
 +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
 @@ -1,1 +1,2 @@
  a
 +a
 
 % preserve chmod +x
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100644
 new mode 100755
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@
  a
  a
 +a
 record this change to 'subdir/f1'? [Ynsfdaq?] 
 changeset:   22:5df857735621
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:20 1970 +0000
 summary:     z
 
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100644
 new mode 100755
 --- a/subdir/f1
 +++ b/subdir/f1
 @@ -1,2 +1,3 @@
  a
  a
 +a
 
 % preserve execute permission on original
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@
  a
  a
  a
 +b
 record this change to 'subdir/f1'? [Ynsfdaq?] 
 changeset:   23:a4ae36a78715
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:21 1970 +0000
 summary:     aa
 
 diff --git a/subdir/f1 b/subdir/f1
 --- a/subdir/f1
 +++ b/subdir/f1
 @@ -1,3 +1,4 @@
  a
  a
  a
 +b
 
 % preserve chmod -x
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100755
 new mode 100644
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@
  a
  a
  b
 +c
 record this change to 'subdir/f1'? [Ynsfdaq?] 
 changeset:   24:1460f6e47966
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:22 1970 +0000
 summary:     ab
 
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100755
 new mode 100644
 --- a/subdir/f1
 +++ b/subdir/f1
 @@ -2,3 +2,4 @@
  a
  a
  b
 +c
 
+% abort early when a merge is in progress
+1 files updated, 0 files merged, 5 files removed, 0 files unresolved
+marked working directory as branch thatbranch
+created new head
+5 files updated, 0 files merged, 2 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+
+abort: cannot partially commit a merge (use hg commit instead)
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % with win32ext
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@
  a
  b
  c
 +d
 record this change to 'subdir/f1'? [Ynsfdaq?] 
-changeset:   25:5bacc1f6e9cf
+changeset:   26:5bacc1f6e9cf
 tag:         tip
+parent:      24:1460f6e47966
 user:        test
 date:        Thu Jan 01 00:00:23 1970 +0000
 summary:     w1
 
 diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1
 --- a/subdir/f1	Thu Jan 01 00:00:22 1970 +0000
 +++ b/subdir/f1	Thu Jan 01 00:00:23 1970 +0000
 @@ -3,3 +3,4 @@
  a
  b
  c
 +d