merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

mercurial/hg.py

@@ -1,288 +1,289
 # hg.py - repository classes for mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
 import errno, lock, os, shutil, util, extensions, error
 import merge as _merge
 import verify as _verify
 
 def _local(path):
     return (os.path.isfile(util.drop_scheme('file', path)) and
             bundlerepo or localrepo)
 
 def parseurl(url, revs=[]):
     '''parse url#branch, returning url, branch + revs'''
 
     if '#' not in url:
         return url, (revs or None), revs and revs[-1] or None
 
     url, branch = url.split('#', 1)
     checkout = revs and revs[-1] or branch
     return url, revs + [branch], checkout
 
 schemes = {
     'bundle': bundlerepo,
     'file': _local,
     'http': httprepo,
     'https': httprepo,
     'ssh': sshrepo,
     'static-http': statichttprepo,
 }
 
 def _lookup(path):
     scheme = 'file'
     if path:
         c = path.find(':')
         if c > 0:
             scheme = path[:c]
     thing = schemes.get(scheme) or schemes['file']
     try:
         return thing(path)
     except TypeError:
         return thing
 
 def islocal(repo):
     '''return true if repo or path is local'''
     if isinstance(repo, str):
         try:
             return _lookup(repo).islocal(repo)
         except AttributeError:
             return False
     return repo.local()
 
 def repository(ui, path='', create=False):
     """return a repository object for the specified path"""
     repo = _lookup(path).instance(ui, path, create)
     ui = getattr(repo, "ui", ui)
     for name, module in extensions.extensions():
         hook = getattr(module, 'reposetup', None)
         if hook:
             hook(ui, repo)
     return repo
 
 def defaultdest(source):
     '''return default destination of clone if none is given'''
     return os.path.basename(os.path.normpath(source))
 
 def localpath(path):
     if path.startswith('file://localhost/'):
         return path[16:]
     if path.startswith('file://'):
         return path[7:]
     if path.startswith('file:'):
         return path[5:]
     return path
 
 def clone(ui, source, dest=None, pull=False, rev=None, update=True,
           stream=False):
     """Make a copy of an existing repository.
 
     Create a copy of an existing repository in a new directory.  The
     source and destination are URLs, as passed to the repository
     function.  Returns a pair of repository objects, the source and
     newly created destination.
 
     The location of the source is added to the new repository's
     .hg/hgrc file, as the default to be used for future pulls and
     pushes.
 
     If an exception is raised, the partly cloned/updated destination
     repository will be deleted.
 
     Arguments:
 
     source: repository object or URL
 
     dest: URL of destination repository to create (defaults to base
     name of source repository)
 
     pull: always pull from source repository, even in local case
 
     stream: stream raw data uncompressed from repository (fast over
     LAN, slow over WAN)
 
     rev: revision to clone up to (implies pull=True)
 
     update: update working directory after clone completes, if
     destination is local repository (True means update to default rev,
     anything else is treated as a revision)
     """
 
     if isinstance(source, str):
         origsource = ui.expandpath(source)
         source, rev, checkout = parseurl(origsource, rev)
         src_repo = repository(ui, source)
     else:
         src_repo = source
         origsource = source = src_repo.url()
         checkout = rev and rev[-1] or None
 
     if dest is None:
         dest = defaultdest(source)
         ui.status(_("destination directory: %s\n") % dest)
 
     dest = localpath(dest)
     source = localpath(source)
 
     if os.path.exists(dest):
         raise util.Abort(_("destination '%s' already exists") % dest)
 
     class DirCleanup(object):
         def __init__(self, dir_):
             self.rmtree = shutil.rmtree
             self.dir_ = dir_
         def close(self):
             self.dir_ = None
         def __del__(self):
             if self.dir_:
                 self.rmtree(self.dir_, True)
 
     src_lock = dest_lock = dir_cleanup = None
     try:
         if islocal(dest):
             dir_cleanup = DirCleanup(dest)
 
         abspath = origsource
         copy = False
         if src_repo.cancopy() and islocal(dest):
             abspath = os.path.abspath(util.drop_scheme('file', origsource))
             copy = not pull and not rev
 
         if copy:
             try:
                 # we use a lock here because if we race with commit, we
                 # can end up with extra data in the cloned revlogs that's
                 # not pointed to by changesets, thus causing verify to
                 # fail
                 src_lock = src_repo.lock()
             except error.LockError:
                 copy = False
 
         if copy:
             if not os.path.exists(dest):
                 os.mkdir(dest)
             try:
                 dest_path = os.path.realpath(os.path.join(dest, ".hg"))
                 os.mkdir(dest_path)
             except OSError, inst:
                 if inst.errno == errno.EEXIST:
                     dir_cleanup.close()
                     raise util.Abort(_("destination '%s' already exists")
                                      % dest)
                 raise
 
             for f in src_repo.store.copylist():
                 src = os.path.join(src_repo.path, f)
                 dst = os.path.join(dest_path, f)
                 dstbase = os.path.dirname(dst)
                 if dstbase and not os.path.exists(dstbase):
                     os.mkdir(dstbase)
                 if os.path.exists(src):
                     if dst.endswith('data'):
                         # lock to avoid premature writing to the target
                         dest_lock = lock.lock(os.path.join(dstbase, "lock"))
                     util.copyfiles(src, dst)
 
             # we need to re-init the repo after manually copying the data
             # into it
             dest_repo = repository(ui, dest)
 
         else:
             try:
                 dest_repo = repository(ui, dest, create=True)
             except OSError, inst:
                 if inst.errno == errno.EEXIST:
                     dir_cleanup.close()
                     raise util.Abort(_("destination '%s' already exists")
                                      % dest)
                 raise
 
             revs = None
             if rev:
                 if 'lookup' not in src_repo.capabilities:
                     raise util.Abort(_("src repository does not support revision "
                                        "lookup and so doesn't support clone by "
                                        "revision"))
                 revs = [src_repo.lookup(r) for r in rev]
 
             if dest_repo.local():
                 dest_repo.clone(src_repo, heads=revs, stream=stream)
             elif src_repo.local():
                 src_repo.push(dest_repo, revs=revs)
             else:
                 raise util.Abort(_("clone from remote to remote not supported"))
 
         if dir_cleanup:
             dir_cleanup.close()
 
         if dest_repo.local():
             fp = dest_repo.opener("hgrc", "w", text=True)
             fp.write("[paths]\n")
             # percent needs to be escaped for ConfigParser
             fp.write("default = %s\n" % abspath.replace('%', '%%'))
             fp.close()
 
             if update:
                 dest_repo.ui.status(_("updating working directory\n"))
                 if update is not True:
                     checkout = update
                 for test in (checkout, 'default', 'tip'):
                     try:
                         uprev = dest_repo.lookup(test)
                         break
                     except:
                         continue
                 _update(dest_repo, uprev)
 
         return src_repo, dest_repo
     finally:
         del src_lock, dest_lock, dir_cleanup
 
 def _showstats(repo, stats):
     stats = ((stats[0], _("updated")),
              (stats[1], _("merged")),
              (stats[2], _("removed")),
              (stats[3], _("unresolved")))
     note = ", ".join([_("%d files %s") % s for s in stats])
     repo.ui.status("%s\n" % note)
 
 def update(repo, node):
     """update the working directory to node, merging linear changes"""
     stats = _merge.update(repo, node, False, False, None)
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
     return stats[3] > 0
 
 # naming conflict in clone()
 _update = update
 
 def clean(repo, node, show_stats=True):
     """forcibly switch the working directory to node, clobbering changes"""
     stats = _merge.update(repo, node, False, True, None)
     if show_stats: _showstats(repo, stats)
     return stats[3] > 0
 
 def merge(repo, node, force=None, remind=True):
     """branch merge with node, resolving changes"""
     stats = _merge.update(repo, node, True, force, False)
     _showstats(repo, stats)
     if stats[3]:
-        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
+        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
+                         "or 'hg up --clean' to abandon\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0
 
 def revert(repo, node, choose):
     """revert changes to revision in node without updating dirstate"""
     return _merge.update(repo, node, False, True, choose)[3] > 0
 
 def verify(repo):
     """verify the consistency of a repository"""
     return _verify.verify(repo)

tests/test-add.out

@@ -1,37 +1,37
 adding a
 ? a
 adding a
 A a
 A a
 ? b
 A a
 A b
 % should fail
 b already tracked!
 A a
 A b
 % should fail
 a already tracked!
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging a
 warning: conflicts during merge.
 merging a failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 M a
 ? a.orig
 % should fail
 a already tracked!
 M a
 ? a.orig
 % issue683
 R a
 ? a.orig
 M a
 ? a.orig
 c does not exist!
 d does not exist!
 M a
 A c
 ? a.orig

tests/test-commit-unresolved.out

@@ -1,14 +1,14
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 
 % Merging a conflict araises
 merging A
 warning: conflicts during merge.
 merging A failed!
 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 
 % Correct the conflict without marking the file as resolved
 abort: unresolved merge conflicts (see hg resolve)
 
 % Mark the conflict as resolved and commit

tests/test-conflict.out

@@ -1,15 +1,15
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging a
 warning: conflicts during merge.
 merging a failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 e7fe8eb3e180+0d24b7662d3e+ tip
 <<<<<<< local
 something else
 =======
 something
 >>>>>>> other
 M a
 ? a.orig

tests/test-convert-svn-sink.out

@@ -1,337 +1,337
 % add
 adding a
 adding d1/d2/b
 % modify
 1:e0e2b8a9156b
 assuming destination a-hg
 initializing svn repo 'a-hg'
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 1 add a file
 0 modify a file
 At revision 2.
                 2        2 test         .
                 2        2 test         a
                 2        1 test         d1
                 2        1 test         d1/d2
                 2        1 test         d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="2">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/a</path>
 </paths>
 <msg>modify a file</msg>
 </logentry>
 <logentry
    revision="1">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/a</path>
 <path
    action="A">/d1</path>
 <path
    action="A">/d1/d2</path>
 <path
    action="A">/d1/d2/b</path>
 </paths>
 <msg>add a file</msg>
 </logentry>
 </log>
 a:
 a
 d1
 
 a-hg-wc:
 a
 d1
 same
 % rename
 2:7009fc4efb34
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 rename a file
 At revision 3.
                 3        3 test         .
                 3        3 test         b
                 3        1 test         d1
                 3        1 test         d1/d2
                 3        1 test         d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="3">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="D">/a</path>
 <path
    copyfrom-path="/a"
    copyfrom-rev="2"
    action="A">/b</path>
 </paths>
 <msg>rename a file</msg>
 </logentry>
 </log>
 a:
 b
 d1
 
 a-hg-wc:
 b
 d1
 % copy
 3:56c519973ce6
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 copy a file
 At revision 4.
                 4        4 test         .
                 4        3 test         b
                 4        4 test         c
                 4        1 test         d1
                 4        1 test         d1/d2
                 4        1 test         d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="4">
 <author>test</author>
 <date/>
 <paths>
 <path
    copyfrom-path="/b"
    copyfrom-rev="3"
    action="A">/c</path>
 </paths>
 <msg>copy a file</msg>
 </logentry>
 </log>
 a:
 b
 c
 d1
 
 a-hg-wc:
 b
 c
 d1
 % remove
 4:ed4dc9a6f585
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 remove a file
 At revision 5.
                 5        5 test         .
                 5        4 test         c
                 5        1 test         d1
                 5        1 test         d1/d2
                 5        1 test         d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="5">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="D">/b</path>
 </paths>
 <msg>remove a file</msg>
 </logentry>
 </log>
 a:
 c
 d1
 
 a-hg-wc:
 c
 d1
 % executable
 5:f205b3636d77
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 make a file executable
 At revision 6.
                 6        6 test         .
                 6        6 test         c
                 6        1 test         d1
                 6        1 test         d1/d2
                 6        1 test         d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="6">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/c</path>
 </paths>
 <msg>make a file executable</msg>
 </logentry>
 </log>
 executable
 % executable in new directory
 adding d1/a
 assuming destination a-hg
 initializing svn repo 'a-hg'
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 add executable file in new directory
 At revision 1.
                 1        1 test         .
                 1        1 test         d1
                 1        1 test         d1/a
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="1">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/d1</path>
 <path
    action="A">/d1/a</path>
 </paths>
 <msg>add executable file in new directory</msg>
 </logentry>
 </log>
 executable
 % copy to new directory
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 copy file to new directory
 At revision 2.
                 2        2 test         .
                 2        1 test         d1
                 2        1 test         d1/a
                 2        2 test         d2
                 2        2 test         d2/a
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="2">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/d2</path>
 <path
    copyfrom-path="/d1/a"
    copyfrom-rev="1"
    action="A">/d2/a</path>
 </paths>
 <msg>copy file to new directory</msg>
 </logentry>
 </log>
 % branchy history
 adding b
 adding left-1
 adding left-2
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 adding right-1
 created new head
 adding right-2
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 merging b
 warning: conflicts during merge.
 merging b failed!
 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 assuming destination b-hg
 initializing svn repo 'b-hg'
 initializing svn wc 'b-hg-wc'
 scanning source...
 sorting...
 converting...
 5 base
 4 left-1
 3 left-2
 2 right-1
 1 right-2
 0 merge
 % expect 4 changes
 At revision 4.
                 4        4 test         .
                 4        3 test         b
                 4        2 test         left-1
                 4        3 test         left-2
                 4        4 test         right-1
                 4        4 test         right-2
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="4">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/right-1</path>
 <path
    action="A">/right-2</path>
 </paths>
 <msg>merge</msg>
 </logentry>
 <logentry
    revision="3">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/b</path>
 <path
    action="A">/left-2</path>
 </paths>
 <msg>left-2</msg>
 </logentry>
 <logentry
    revision="2">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/b</path>
 <path
    action="A">/left-1</path>
 </paths>
 <msg>left-1</msg>
 </logentry>
 <logentry
    revision="1">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/b</path>
 </paths>
 <msg>base</msg>
 </logentry>
 </log>

tests/test-keyword.out

@@ -1,502 +1,502
 % help
 keyword extension - keyword expansion in local repositories
 
 This extension expands RCS/CVS-like or self-customized $Keywords$
 in tracked text files selected by your configuration.
 
 Keywords are only expanded in local repositories and not stored in
 the change history. The mechanism can be regarded as a convenience
 for the current user or for archive distribution.
 
 Configuration is done in the [keyword] and [keywordmaps] sections
 of hgrc files.
 
 Example:
 
     [keyword]
     # expand keywords in every python file except those matching "x*"
     **.py =
     x*    = ignore
 
 Note: the more specific you are in your filename patterns
       the less you lose speed in huge repos.
 
 For [keywordmaps] template mapping and expansion demonstration and
 control run "hg kwdemo".
 
 An additional date template filter {date|utcdate} is provided.
 
 The default template mappings (view with "hg kwdemo -d") can be replaced
 with customized keywords and templates.
 Again, run "hg kwdemo" to control the results of your config changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
 the risk of inadvertedly storing expanded keywords in the change history.
 
 To force expansion after enabling it, or a configuration change, run
 "hg kwexpand".
 
 Also, when committing with the record extension or using mq's qrecord, be aware
 that keywords cannot be updated. Again, run "hg kwexpand" on the files in
 question to update keyword expansions after all changes have been checked in.
 
 Expansions spanning more than one line and incremental expansions,
 like CVS' $Log$, are not supported. A keyword template map
 "Log = {desc}" expands to the first line of the changeset description.
 
 list of commands:
 
  kwdemo     print [keywordmaps] configuration and an expansion example
  kwexpand   expand keywords in working directory
  kwfiles    print files currently configured for keyword expansion
  kwshrink   revert expanded keywords in working directory
 
 enabled extensions:
 
  keyword   keyword expansion in local repositories
  mq        patch management and development
  notify    hook extension to email notifications on commits/pushes
 
 use "hg -v help keyword" to show aliases and global options
 % hg kwdemo
 [extensions]
 hgext.keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 RCSFile = {file|basename},v
 Author = {author|user}
 Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
 Source = {root}/{file},v
 Date = {date|utcdate}
 Id = {file|basename},v {node|short} {date|utcdate} {author|user}
 Revision = {node|short}
 $RCSFile: demo.txt,v $
 $Author: test $
 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
 $Source: /TMP/demo.txt,v $
 $Date: 2000/00/00 00:00:00 $
 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
 $Revision: xxxxxxxxxxxx $
 [extensions]
 hgext.keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 Branch = {branches}
 $Branch: demobranch $
 % kwshrink should exit silently in empty/invalid repo
 pulling from test-keyword.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 ignore $Id$
 % addremove
 adding a
 adding b
 % status
 A a
 A b
 % default keyword expansion including commit hook
 % interrupted commit should not change state or run commit hook
 a
 b
 transaction abort!
 rollback completed
 abort: empty commit message
 % status
 A a
 A b
 % commit
 a
 b
 overwriting a expanding keywords
 running hook commit.test: cp a hooktest
 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
 % status
 ? hooktest
 % identify
 ef63ca68695b
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % hg cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 a
 % diff a hooktest
 % removing commit hook from config
 % bundle
 2 changesets found
 % notify on pull to check whether keywords stay as is in email
 % ie. if patch.diff wrapper acts as it should
 % pull from bundle
 pulling from ../kw.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
 
 diff -r 000000000000 -r a2392c293916 sym
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
 @@ -0,0 +1,1 @@
 +a
 \ No newline at end of file
 
 diff -r a2392c293916 -r ef63ca68695b a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 diff -r a2392c293916 -r ef63ca68695b b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +ignore $Id$
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % remove notify config
 % touch
 % status
 % update
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % check whether expansion is filewise
 % commit c
 adding c
 % force expansion
 overwriting a expanding keywords
 overwriting c expanding keywords
 % compare changenodes in a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qinit -c
 % qimport
 % qcommit
 % keywords should not be expanded in patch
 # HG changeset patch
 # User User Name <[e-mail]>
 # Date 1 0
 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
 # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
 cndiff
 
 diff -r ef63ca68695b -r 40a904bbbe4c c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,2 @@
 +$Id$
 +tests for different changenodes
 % qpop
 patch queue now empty
 % qgoto - should imply qpush
 applying mqtest.diff
 now at: mqtest.diff
 % cat
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qpop and move on
 patch queue now empty
 % copy
 % kwfiles added
 a
 c
 % commit
 c
  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 overwriting c expanding keywords
 committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f
 % cat a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $
 do not process $Id:
 xxx $
 % touch copied c
 % status
 % kwfiles
 a
 c
 % diff --rev
 diff -r ef63ca68695b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 % rollback
 rolling back last transaction
 % status
 A c
 % update -C
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % custom keyword expansion
 % try with kwdemo
 [extensions]
 hgext.keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 Xinfo = {author}: {desc}
 $Xinfo: test: hg keyword config and expansion example $
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % hg cat
 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
 do not process $Id:
 xxx $
 ignore $Id$
 a
 % interrupted commit should not change state
 transaction abort!
 rollback completed
 abort: empty commit message
 % status
 M a
 ? log
 % commit
 a
 overwriting a expanding keywords
 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
 % status
 % verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 3 changesets, 4 total revisions
 % cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 % hg cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 a
 % annotate
 1: expand $Id$
 1: do not process $Id:
 1: xxx $
 2: $Xinfo$
 % remove
 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
 % rollback
 rolling back last transaction
 % status
 R a
 % revert a
 % cat a
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 % clone to test incoming
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
 updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
 comparing with test-keyword/Test
 searching for changes
 changeset:   2:bb948857c743
 tag:         tip
 user:        User Name <[e-mail]>
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     firstline
 
 % commit rejecttest
 a
 overwriting a expanding keywords
 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
 % export
 % import
 applying ../rejecttest.diff
 % cat
 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
 do not process $Id: rejecttest
 xxx $
 $Xinfo: User Name <[e-mail]>: rejects? $
 ignore $Id$
 
 % rollback
 rolling back last transaction
 % clean update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % kwexpand/kwshrink on selected files
 % copy a x/a
 % kwexpand a
 overwriting a expanding keywords
 % kwexpand x/a should abort
 abort: outstanding uncommitted changes
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords
 committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e
 % cat a
 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: xa $
 % kwshrink a inside directory x
 overwriting x/a shrinking keywords
 % cat a
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 % kwexpand nonexistent
 nonexistent:
 % hg serve
 % expansion
 % hgweb file
 200 Script output follows
 
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 % no expansion
 % hgweb annotate
 200 Script output follows
 
 
 user@1: expand $Id$
 user@1: do not process $Id:
 user@1: xxx $
 user@2: $Xinfo$
 
 
 
 
 % hgweb changeset
 200 Script output follows
 
 
 # HG changeset patch
 # User User Name <[e-mail]>
 # Date 3 0
 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
 # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,4 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 +$Xinfo$
 
 % hgweb filediff
 200 Script output follows
 
 
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:02 1970 +0000
 @@ -1,3 +1,4 @@
  expand $Id$
  do not process $Id:
  xxx $
 +$Xinfo$
 
 
 
 
 % errors encountered
 % merge/resolve
 % simplemerge
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $
 foo
 % conflict
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging m
 warning: conflicts during merge.
 merging m failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 % keyword stays outside conflict zone
 $Id$
 <<<<<<< local
 bar
 =======
 foo
 >>>>>>> other
 % resolve to local
 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $
 bar
 % switch off expansion
 % kwshrink with unknown file u
 overwriting a shrinking keywords
 overwriting m shrinking keywords
 overwriting x/a shrinking keywords
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 % hg cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 a
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 % hg cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 a

tests/test-merge-internal-tools-pattern.out

@@ -1,41 +1,41
 # initial file contents
 adding f
 line 1
 line 2
 line 3
 # branch 1: editing line 1
 # branch 2: editing line 3
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 # merge using internal:fail tool
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 line 1
 line 2
 third line
 M f
 # merge using internal:local tool
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 line 1
 line 2
 third line
 M f
 # merge using internal:other tool
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 first line
 line 2
 line 3
 M f
 # merge using default tool
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 first line
 line 2
 third line
 M f

tests/test-merge-tools.out

@@ -1,395 +1,395
 # revision 0
 adding f
 # revision 1
 # revision 2
 created new head
 # revision 3 - simple to merge
 created new head
 
 
 Tool selection
 
 # default is internal merge:
 [merge-tools]
 # hg update -C 1
 # hg merge -r 2
 merging f
 warning: conflicts during merge.
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 <<<<<<< local
 revision 1
 =======
 revision 2
 >>>>>>> other
 space
 # hg stat
 M f
 ? f.orig
 
 # simplest hgrc using false for merge:
 [merge-tools]
 false.whatever=
 # hg update -C 1
 # hg merge -r 2
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # true with higher .priority gets precedence:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # unless lowered on command line:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.priority=-7
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # or false set higher on command line:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.false.priority=117
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # or true.executable not found in PATH:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # or true.executable with bogus path:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # but true.executable set to cat found in PATH works:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2
 revision 1
 space
 revision 0
 space
 revision 2
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # and true.executable set to cat with path works:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.executable=/bin/cat
 revision 1
 space
 revision 0
 space
 revision 2
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 
 Tool selection and merge-patterns
 
 # merge-patterns specifies new tool false:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-patterns.f=false
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # merge-patterns specifies executable not found in PATH and gets warning:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
 couldn't find merge tool true specified for f
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # merge-patterns specifies executable with bogus path and gets warning:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool
 couldn't find merge tool true specified for f
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 
 Premerge
 
 # Default is silent simplemerge:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 3
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 revision 3
 # hg stat
 M f
 
 # .premerge=True is same:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 3 --config merge-tools.true.premerge=True
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 revision 3
 # hg stat
 M f
 
 # .premerge=False executes merge-tool:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 3 --config merge-tools.true.premerge=False
 revision 1
 space
 revision 0
 space
 revision 0
 space
 revision 3
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 
 Tool execution
 
 # set tools.args explicit to include $base $local $other $output:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 ==> ... <==
 revision 0
 space
 
 ==> ... <==
 revision 1
 space
 
 ==> ... <==
 revision 2
 space
 
 ==> ... <==
 revision 1
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # Merge with "echo mergeresult > $local":
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 mergeresult
 # hg stat
 M f
 
 # - and $local is the file f:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 mergeresult
 # hg stat
 M f
 
 # Merge with "echo mergeresult > $output" - the variable is a bit magic:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 mergeresult
 # hg stat
 M f
 
 
 Merge post-processing
 
 # cat is a bad merge-tool and doesn't change:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.checkchanged=1
 revision 1
 space
 revision 0
 space
 revision 2
 space
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 

tests/test-merge7.out

@@ -1,77 +1,77
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../test-a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merging test.txt
 warning: conflicts during merge.
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 pulling from ../test-a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 resolving manifests
  overwrite None partial False
  ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
   searching for copies back to rev 1
  test.txt: versions differ -> m
 preserving test.txt for resolve of test.txt
 picked tool 'internal:merge' for test.txt (binary False symlink False)
 merging test.txt
 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
 warning: conflicts during merge.
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 one
 <<<<<<< local
 two-point-five
 =======
 two-point-one
 >>>>>>> other
 three
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 01365c4cca56 000000000000 000000000000
      1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
      2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
      3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
      4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
 changeset:   4:a070d41e8360
 tag:         tip
 parent:      2:faaea63e63a9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     two -> two-point-one
 
 changeset:   3:451c744aabcc
 parent:      1:e409be6afcc0
 parent:      2:faaea63e63a9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Merge 1
 
 changeset:   2:faaea63e63a9
 parent:      0:095c92b91f1a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Numbers as words
 
 changeset:   1:e409be6afcc0
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2 -> 2.5
 
 changeset:   0:095c92b91f1a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Initial
 

tests/test-merge9.out

@@ -1,39 +1,39
 adding bar
 adding foo
 adding quux1
 adding quux2
 created new head
 merging bar
 merging bar failed!
 merging foo and baz to baz
 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 U bar
 R baz
 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging bar
 merging bar failed!
 merging baz and foo to baz
 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 % show unresolved
 U bar
 R baz
 % unmark baz
 % show
 U bar
 U baz
 % re-resolve baz
 merging baz and foo to baz
 % after
 U bar
 R baz
 % resolve all warning
 abort: no files or directories specified; use --all to remerge all files
 % resolve all
 merging bar
 warning: conflicts during merge.
 merging bar failed!
 % after
 U bar
 R baz

tests/test-resolve.out

@@ -1,8 +1,8
 adding file
 % create a second head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 % failing merge
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 % resolve -l, should be empty