tags: explicitly log which tags cache file is being written

We now have multiple tags cache files. Record exactly which file is
being written. This should help aid debugging into performance issues
with any single filter.

mercurial/tags.py

@@ -1,533 +1,534
 # tags.py - read tag info from local repository
 #
 # Copyright 2009 Matt Mackall <[e-mail]>
 # Copyright 2009 Greg Ward <[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.
 
 # Currently this module only deals with reading and caching tags.
 # Eventually, it could take care of updating (adding/removing/moving)
 # tags too.
 
 from node import nullid, bin, hex, short
 from i18n import _
 import util
 import encoding
 import error
 from array import array
 import errno
 import time
 
 # Tags computation can be expensive and caches exist to make it fast in
 # the common case.
 #
 # The "hgtagsfnodes1" cache file caches the .hgtags filenode values for
 # each revision in the repository. The file is effectively an array of
 # fixed length records. Read the docs for "hgtagsfnodescache" for technical
 # details.
 #
 # The .hgtags filenode cache grows in proportion to the length of the
 # changelog. The file is truncated when the # changelog is stripped.
 #
 # The purpose of the filenode cache is to avoid the most expensive part
 # of finding global tags, which is looking up the .hgtags filenode in the
 # manifest for each head. This can take dozens or over 100ms for
 # repositories with very large manifests. Multiplied by dozens or even
 # hundreds of heads and there is a significant performance concern.
 #
 # There also exist a separate cache file for each repository filter.
 # These "tags-*" files store information about the history of tags.
 #
 # The tags cache files consists of a cache validation line followed by
 # a history of tags.
 #
 # The cache validation line has the format:
 #
 #   <tiprev> <tipnode> [<filteredhash>]
 #
 # <tiprev> is an integer revision and <tipnode> is a 40 character hex
 # node for that changeset. These redundantly identify the repository
 # tip from the time the cache was written. In addition, <filteredhash>,
 # if present, is a 40 character hex hash of the contents of the filtered
 # revisions for this filter. If the set of filtered revs changes, the
 # hash will change and invalidate the cache.
 #
 # The history part of the tags cache consists of lines of the form:
 #
 #   <node> <tag>
 #
 # (This format is identical to that of .hgtags files.)
 #
 # <tag> is the tag name and <node> is the 40 character hex changeset
 # the tag is associated with.
 #
 # Tags are written sorted by tag name.
 #
 # Tags associated with multiple changesets have an entry for each changeset.
 # The most recent changeset (in terms of revlog ordering for the head
 # setting it) for each tag is last.
 
 def findglobaltags(ui, repo, alltags, tagtypes):
     '''Find global tags in a repo.
 
     "alltags" maps tag name to (node, hist) 2-tuples.
 
     "tagtypes" maps tag name to tag type. Global tags always have the
     "global" tag type.
 
     The "alltags" and "tagtypes" dicts are updated in place. Empty dicts
     should be passed in.
 
     The tags cache is read and updated as a side-effect of calling.
     '''
     # This is so we can be lazy and assume alltags contains only global
     # tags when we pass it to _writetagcache().
     assert len(alltags) == len(tagtypes) == 0, \
            "findglobaltags() should be called first"
 
     (heads, tagfnode, valid, cachetags, shouldwrite) = _readtagcache(ui, repo)
     if cachetags is not None:
         assert not shouldwrite
         # XXX is this really 100% correct?  are there oddball special
         # cases where a global tag should outrank a local tag but won't,
         # because cachetags does not contain rank info?
         _updatetags(cachetags, 'global', alltags, tagtypes)
         return
 
     seen = set()  # set of fnode
     fctx = None
     for head in reversed(heads):  # oldest to newest
         assert head in repo.changelog.nodemap, \
                "tag cache returned bogus head %s" % short(head)
 
         fnode = tagfnode.get(head)
         if fnode and fnode not in seen:
             seen.add(fnode)
             if not fctx:
                 fctx = repo.filectx('.hgtags', fileid=fnode)
             else:
                 fctx = fctx.filectx(fnode)
 
             filetags = _readtags(ui, repo, fctx.data().splitlines(), fctx)
             _updatetags(filetags, 'global', alltags, tagtypes)
 
     # and update the cache (if necessary)
     if shouldwrite:
         _writetagcache(ui, repo, valid, alltags)
 
 def readlocaltags(ui, repo, alltags, tagtypes):
     '''Read local tags in repo. Update alltags and tagtypes.'''
     try:
         data = repo.vfs.read("localtags")
     except IOError, inst:
         if inst.errno != errno.ENOENT:
             raise
         return
 
     # localtags is in the local encoding; re-encode to UTF-8 on
     # input for consistency with the rest of this module.
     filetags = _readtags(
         ui, repo, data.splitlines(), "localtags",
         recode=encoding.fromlocal)
 
     # remove tags pointing to invalid nodes
     cl = repo.changelog
     for t in filetags.keys():
         try:
             cl.rev(filetags[t][0])
         except (LookupError, ValueError):
             del filetags[t]
 
     _updatetags(filetags, "local", alltags, tagtypes)
 
 def _readtaghist(ui, repo, lines, fn, recode=None, calcnodelines=False):
     '''Read tag definitions from a file (or any source of lines).
 
     This function returns two sortdicts with similar information:
 
     - the first dict, bintaghist, contains the tag information as expected by
       the _readtags function, i.e. a mapping from tag name to (node, hist):
         - node is the node id from the last line read for that name,
         - hist is the list of node ids previously associated with it (in file
           order). All node ids are binary, not hex.
 
     - the second dict, hextaglines, is a mapping from tag name to a list of
       [hexnode, line number] pairs, ordered from the oldest to the newest node.
 
     When calcnodelines is False the hextaglines dict is not calculated (an
     empty dict is returned). This is done to improve this function's
     performance in cases where the line numbers are not needed.
     '''
 
     bintaghist = util.sortdict()
     hextaglines = util.sortdict()
     count = 0
 
     def warn(msg):
         ui.warn(_("%s, line %s: %s\n") % (fn, count, msg))
 
     for nline, line in enumerate(lines):
         count += 1
         if not line:
             continue
         try:
             (nodehex, name) = line.split(" ", 1)
         except ValueError:
             warn(_("cannot parse entry"))
             continue
         name = name.strip()
         if recode:
             name = recode(name)
         try:
             nodebin = bin(nodehex)
         except TypeError:
             warn(_("node '%s' is not well formed") % nodehex)
             continue
 
         # update filetags
         if calcnodelines:
             # map tag name to a list of line numbers
             if name not in hextaglines:
                 hextaglines[name] = []
             hextaglines[name].append([nodehex, nline])
             continue
         # map tag name to (node, hist)
         if name not in bintaghist:
             bintaghist[name] = []
         bintaghist[name].append(nodebin)
     return bintaghist, hextaglines
 
 def _readtags(ui, repo, lines, fn, recode=None, calcnodelines=False):
     '''Read tag definitions from a file (or any source of lines).
 
     Returns a mapping from tag name to (node, hist).
 
     "node" is the node id from the last line read for that name. "hist"
     is the list of node ids previously associated with it (in file order).
     All node ids are binary, not hex.
     '''
     filetags, nodelines = _readtaghist(ui, repo, lines, fn, recode=recode,
                                        calcnodelines=calcnodelines)
     for tag, taghist in filetags.items():
         filetags[tag] = (taghist[-1], taghist[:-1])
     return filetags
 
 def _updatetags(filetags, tagtype, alltags, tagtypes):
     '''Incorporate the tag info read from one file into the two
     dictionaries, alltags and tagtypes, that contain all tag
     info (global across all heads plus local).'''
 
     for name, nodehist in filetags.iteritems():
         if name not in alltags:
             alltags[name] = nodehist
             tagtypes[name] = tagtype
             continue
 
         # we prefer alltags[name] if:
         #  it supersedes us OR
         #  mutual supersedes and it has a higher rank
         # otherwise we win because we're tip-most
         anode, ahist = nodehist
         bnode, bhist = alltags[name]
         if (bnode != anode and anode in bhist and
             (bnode not in ahist or len(bhist) > len(ahist))):
             anode = bnode
         else:
             tagtypes[name] = tagtype
         ahist.extend([n for n in bhist if n not in ahist])
         alltags[name] = anode, ahist
 
 def _filename(repo):
     """name of a tagcache file for a given repo or repoview"""
     filename = 'cache/tags2'
     if repo.filtername:
         filename = '%s-%s' % (filename, repo.filtername)
     return filename
 
 def _readtagcache(ui, repo):
     '''Read the tag cache.
 
     Returns a tuple (heads, fnodes, validinfo, cachetags, shouldwrite).
 
     If the cache is completely up-to-date, "cachetags" is a dict of the
     form returned by _readtags() and "heads", "fnodes", and "validinfo" are
     None and "shouldwrite" is False.
 
     If the cache is not up to date, "cachetags" is None. "heads" is a list
     of all heads currently in the repository, ordered from tip to oldest.
     "validinfo" is a tuple describing cache validation info. This is used
     when writing the tags cache. "fnodes" is a mapping from head to .hgtags
     filenode. "shouldwrite" is True.
 
     If the cache is not up to date, the caller is responsible for reading tag
     info from each returned head. (See findglobaltags().)
     '''
     import scmutil  # avoid cycle
 
     try:
         cachefile = repo.vfs(_filename(repo), 'r')
         # force reading the file for static-http
         cachelines = iter(cachefile)
     except IOError:
         cachefile = None
 
     cacherev = None
     cachenode = None
     cachehash = None
     if cachefile:
         try:
             validline = cachelines.next()
             validline = validline.split()
             cacherev = int(validline[0])
             cachenode = bin(validline[1])
             if len(validline) > 2:
                 cachehash = bin(validline[2])
         except Exception:
             # corruption of the cache, just recompute it.
             pass
 
     tipnode = repo.changelog.tip()
     tiprev = len(repo.changelog) - 1
 
     # Case 1 (common): tip is the same, so nothing has changed.
     # (Unchanged tip trivially means no changesets have been added.
     # But, thanks to localrepository.destroyed(), it also means none
     # have been destroyed by strip or rollback.)
     if (cacherev == tiprev
             and cachenode == tipnode
             and cachehash == scmutil.filteredhash(repo, tiprev)):
         tags = _readtags(ui, repo, cachelines, cachefile.name)
         cachefile.close()
         return (None, None, None, tags, False)
     if cachefile:
         cachefile.close()               # ignore rest of file
 
     valid = (tiprev, tipnode, scmutil.filteredhash(repo, tiprev))
 
     repoheads = repo.heads()
     # Case 2 (uncommon): empty repo; get out quickly and don't bother
     # writing an empty cache.
     if repoheads == [nullid]:
         return ([], {}, valid, {}, False)
 
     # Case 3 (uncommon): cache file missing or empty.
 
     # Case 4 (uncommon): tip rev decreased.  This should only happen
     # when we're called from localrepository.destroyed().  Refresh the
     # cache so future invocations will not see disappeared heads in the
     # cache.
 
     # Case 5 (common): tip has changed, so we've added/replaced heads.
 
     # As it happens, the code to handle cases 3, 4, 5 is the same.
 
     # N.B. in case 4 (nodes destroyed), "new head" really means "newly
     # exposed".
     if not len(repo.file('.hgtags')):
         # No tags have ever been committed, so we can avoid a
         # potentially expensive search.
         return ([], {}, valid, None, True)
 
     starttime = time.time()
 
     # Now we have to lookup the .hgtags filenode for every new head.
     # This is the most expensive part of finding tags, so performance
     # depends primarily on the size of newheads.  Worst case: no cache
     # file, so newheads == repoheads.
     fnodescache = hgtagsfnodescache(repo.unfiltered())
     cachefnode = {}
     for head in reversed(repoheads):
         fnode = fnodescache.getfnode(head)
         if fnode != nullid:
             cachefnode[head] = fnode
 
     fnodescache.write()
 
     duration = time.time() - starttime
     ui.log('tagscache',
            '%d/%d cache hits/lookups in %0.4f '
            'seconds\n',
            fnodescache.hitcount, fnodescache.lookupcount, duration)
 
     # Caller has to iterate over all heads, but can use the filenodes in
     # cachefnode to get to each .hgtags revision quickly.
     return (repoheads, cachefnode, valid, None, True)
 
 def _writetagcache(ui, repo, valid, cachetags):
+    filename = _filename(repo)
     try:
-        cachefile = repo.vfs(_filename(repo), 'w', atomictemp=True)
+        cachefile = repo.vfs(filename, 'w', atomictemp=True)
     except (OSError, IOError):
         return
 
-    ui.log('tagscache', 'writing tags cache file with %d tags\n',
-           len(cachetags))
+    ui.log('tagscache', 'writing .hg/%s with %d tags\n',
+           filename, len(cachetags))
 
     if valid[2]:
         cachefile.write('%d %s %s\n' % (valid[0], hex(valid[1]), hex(valid[2])))
     else:
         cachefile.write('%d %s\n' % (valid[0], hex(valid[1])))
 
     # Tag names in the cache are in UTF-8 -- which is the whole reason
     # we keep them in UTF-8 throughout this module.  If we converted
     # them local encoding on input, we would lose info writing them to
     # the cache.
     for (name, (node, hist)) in sorted(cachetags.iteritems()):
         for n in hist:
             cachefile.write("%s %s\n" % (hex(n), name))
         cachefile.write("%s %s\n" % (hex(node), name))
 
     try:
         cachefile.close()
     except (OSError, IOError):
         pass
 
 _fnodescachefile = 'cache/hgtagsfnodes1'
 _fnodesrecsize = 4 + 20 # changeset fragment + filenode
 _fnodesmissingrec = '\xff' * 24
 
 class hgtagsfnodescache(object):
     """Persistent cache mapping revisions to .hgtags filenodes.
 
     The cache is an array of records. Each item in the array corresponds to
     a changelog revision. Values in the array contain the first 4 bytes of
     the node hash and the 20 bytes .hgtags filenode for that revision.
 
     The first 4 bytes are present as a form of verification. Repository
     stripping and rewriting may change the node at a numeric revision in the
     changelog. The changeset fragment serves as a verifier to detect
     rewriting. This logic is shared with the rev branch cache (see
     branchmap.py).
 
     The instance holds in memory the full cache content but entries are
     only parsed on read.
 
     Instances behave like lists. ``c[i]`` works where i is a rev or
     changeset node. Missing indexes are populated automatically on access.
     """
     def __init__(self, repo):
         assert repo.filtername is None
 
         self._repo = repo
 
         # Only for reporting purposes.
         self.lookupcount = 0
         self.hitcount = 0
 
         self._raw = array('c')
 
         data = repo.vfs.tryread(_fnodescachefile)
         self._raw.fromstring(data)
 
         # The end state of self._raw is an array that is of the exact length
         # required to hold a record for every revision in the repository.
         # We truncate or extend the array as necessary. self._dirtyoffset is
         # defined to be the start offset at which we need to write the output
         # file. This offset is also adjusted when new entries are calculated
         # for array members.
         cllen = len(repo.changelog)
         wantedlen = cllen * _fnodesrecsize
         rawlen = len(self._raw)
 
         self._dirtyoffset = None
 
         if rawlen < wantedlen:
             self._dirtyoffset = rawlen
             self._raw.extend('\xff' * (wantedlen - rawlen))
         elif rawlen > wantedlen:
             # There's no easy way to truncate array instances. This seems
             # slightly less evil than copying a potentially large array slice.
             for i in range(rawlen - wantedlen):
                 self._raw.pop()
             self._dirtyoffset = len(self._raw)
 
     def getfnode(self, node):
         """Obtain the filenode of the .hgtags file at a specified revision.
 
         If the value is in the cache, the entry will be validated and returned.
         Otherwise, the filenode will be computed and returned.
 
         If an .hgtags does not exist at the specified revision, nullid is
         returned.
         """
         ctx = self._repo[node]
         rev = ctx.rev()
 
         self.lookupcount += 1
 
         offset = rev * _fnodesrecsize
         record = self._raw[offset:offset + _fnodesrecsize].tostring()
         properprefix = node[0:4]
 
         # Validate and return existing entry.
         if record != _fnodesmissingrec:
             fileprefix = record[0:4]
 
             if fileprefix == properprefix:
                 self.hitcount += 1
                 return record[4:]
 
             # Fall through.
 
         # If we get here, the entry is either missing or invalid. Populate it.
         try:
             fnode = ctx.filenode('.hgtags')
         except error.LookupError:
             # No .hgtags file on this revision.
             fnode = nullid
 
         # Slices on array instances only accept other array.
         entry = array('c', properprefix + fnode)
         self._raw[offset:offset + _fnodesrecsize] = entry
         # self._dirtyoffset could be None.
         self._dirtyoffset = min(self._dirtyoffset, offset) or 0
 
         return fnode
 
     def write(self):
         """Perform all necessary writes to cache file.
 
         This may no-op if no writes are needed or if a write lock could
         not be obtained.
         """
         if self._dirtyoffset is None:
             return
 
         data = self._raw[self._dirtyoffset:]
         if not data:
             return
 
         repo = self._repo
 
         try:
             lock = repo.wlock(wait=False)
         except error.LockHeld:
             repo.ui.log('tagscache',
                         'not writing .hg/%s because lock held\n' %
                         (_fnodescachefile))
             return
 
         try:
             try:
                 f = repo.vfs.open(_fnodescachefile, 'ab')
                 try:
                     # if the file has been truncated
                     actualoffset = f.tell()
                     if actualoffset < self._dirtyoffset:
                         self._dirtyoffset = actualoffset
                         data = self._raw[self._dirtyoffset:]
                     f.seek(self._dirtyoffset)
                     f.truncate()
                     repo.ui.log('tagscache',
                                 'writing %d bytes to %s\n' % (
                                 len(data), _fnodescachefile))
                     f.write(data)
                     self._dirtyoffset = None
                 finally:
                     f.close()
             except (IOError, OSError), inst:
                 repo.ui.log('tagscache',
                             "couldn't write %s: %s\n" % (
                             _fnodescachefile, inst))
         finally:
             lock.release()

tests/test-blackbox.t

@@ -1,147 +1,147
 setup
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > blackbox=
   > mock=$TESTDIR/mockblackbox.py
   > mq=
   > EOF
   $ hg init blackboxtest
   $ cd blackboxtest
 
 command, exit codes, and duration
 
   $ echo a > a
   $ hg add a
   $ hg blackbox
   1970/01/01 00:00:00 bob> add a
   1970/01/01 00:00:00 bob> add a exited 0 after * seconds (glob)
 
 incoming change tracking
 
 create two heads to verify that we only see one change in the log later
   $ hg commit -ma
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > b
   $ hg commit -Amb
   adding b
   created new head
 
 clone, commit, pull
   $ hg clone . ../blackboxtest2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo c > c
   $ hg commit -Amc
   adding c
   $ cd ../blackboxtest2
   $ hg pull
   pulling from $TESTTMP/blackboxtest (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> pull
   1970/01/01 00:00:00 bob> updated served branch cache in ?.???? seconds (glob)
   1970/01/01 00:00:00 bob> wrote served branch cache with 1 labels and 2 nodes
   1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62
   1970/01/01 00:00:00 bob> pull exited 0 after * seconds (glob)
 
 we must not cause a failure if we cannot write to the log
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo pull)
 
 #if unix-permissions no-root
   $ chmod 000 .hg/blackbox.log
   $ hg --debug incoming
   warning: cannot write to blackbox.log: Permission denied
   comparing with $TESTTMP/blackboxtest (glob)
   query 1; heads
   searching for changes
   all local heads known remotely
   changeset:   2:d02f48003e62c24e2659d97d30f2a83abe5d5d51
   tag:         tip
   phase:       draft
   parent:      1:6563da9dcf87b1949716e38ff3e3dfaa3198eb06
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    2:ab9d46b053ebf45b7996f2922b9893ff4b63d892
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      c
   extra:       branch=default
   description:
   c
   
   
 #endif
   $ hg pull
   pulling from $TESTTMP/blackboxtest (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
 a failure reading from the log is fine
 #if unix-permissions no-root
   $ hg blackbox -l 3
   abort: Permission denied: $TESTTMP/blackboxtest2/.hg/blackbox.log
   [255]
 
   $ chmod 600 .hg/blackbox.log
 #endif
 
 backup bundles get logged
 
   $ touch d
   $ hg commit -Amd
   adding d
   created new head
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> strip tip
   1970/01/01 00:00:00 bob> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
   1970/01/01 00:00:00 bob> updated base branch cache in ?.???? seconds (glob)
   1970/01/01 00:00:00 bob> wrote base branch cache with 1 labels and 2 nodes
   1970/01/01 00:00:00 bob> strip tip exited 0 after * seconds (glob)
 
 extension and python hooks - use the eol extension for a pythonhook
 
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'eol=' >> .hg/hgrc
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'update = echo hooked' >> .hg/hgrc
   $ hg update
   hooked
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> update
-  1970/01/01 00:00:00 bob> writing tags cache file with 0 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 0 tags
   1970/01/01 00:00:00 bob> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)
   1970/01/01 00:00:00 bob> exthook-update: echo hooked finished in * seconds (glob)
   1970/01/01 00:00:00 bob> update exited 0 after * seconds (glob)
 
 log rotation
 
   $ echo '[blackbox]' >> .hg/hgrc
   $ echo 'maxsize = 20 b' >> .hg/hgrc
   $ echo 'maxfiles = 3' >> .hg/hgrc
   $ hg status
   $ hg status
   $ hg status
   $ hg tip -q
   2:d02f48003e62
   $ ls .hg/blackbox.log*
   .hg/blackbox.log
   .hg/blackbox.log.1
   .hg/blackbox.log.2
 
 cleanup
   $ cd ..

tests/test-mq.t

@@ -1,1608 +1,1608
   $ checkundo()
   > {
   >     if [ -f .hg/store/undo ]; then
   >     echo ".hg/store/undo still exists after $1"
   >     fi
   > }
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > mq =
   > [mq]
   > plain = true
   > EOF
 
 
 help
 
   $ hg help mq
   mq extension - manage a stack of patches
   
   This extension lets you work with a stack of patches in a Mercurial
   repository. It manages two stacks of patches - all known patches, and applied
   patches (subset of known patches).
   
   Known patches are represented as patch files in the .hg/patches directory.
   Applied patches are both patch files and changesets.
   
   Common tasks (use "hg help command" for more details):
   
     create new patch                          qnew
     import existing patch                     qimport
   
     print patch series                        qseries
     print applied patches                     qapplied
   
     add known patch to applied stack          qpush
     remove patch from applied stack           qpop
     refresh contents of top applied patch     qrefresh
   
   By default, mq will automatically use git patches when required to avoid
   losing file mode changes, copy records, binary files or empty files creations
   or deletions. This behaviour can be configured with:
   
     [mq]
     git = auto/keep/yes/no
   
   If set to 'keep', mq will obey the [diff] section configuration while
   preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
   will override the [diff] section and always generate git or regular patches,
   possibly losing data in the second case.
   
   It may be desirable for mq changesets to be kept in the secret phase (see "hg
   help phases"), which can be enabled with the following setting:
   
     [mq]
     secret = True
   
   You will by default be managing a patch queue named "patches". You can create
   other, independent patch queues with the "hg qqueue" command.
   
   If the working directory contains uncommitted files, qpush, qpop and qgoto
   abort immediately. If -f/--force is used, the changes are discarded. Setting:
   
     [mq]
     keepchanges = True
   
   make them behave as if --keep-changes were passed, and non-conflicting local
   changes will be tolerated and preserved. If incompatible options such as
   -f/--force or --exact are passed, this setting is ignored.
   
   This extension used to provide a strip command. This command now lives in the
   strip extension.
   
   list of commands:
   
    qapplied      print the patches already applied
    qclone        clone main and patch repository at same time
    qdelete       remove patches from queue
    qdiff         diff of the current patch and subsequent modifications
    qfinish       move applied patches into repository history
    qfold         fold the named patches into the current patch
    qgoto         push or pop patches until named patch is at top of stack
    qguard        set or print guards for a patch
    qheader       print the header of the topmost or specified patch
    qimport       import a patch or existing changeset
    qnew          create a new patch
    qnext         print the name of the next pushable patch
    qpop          pop the current patch off the stack
    qprev         print the name of the preceding applied patch
    qpush         push the next patch onto the stack
    qqueue        manage multiple patch queues
    qrefresh      update the current patch
    qrename       rename a patch
    qselect       set or print guarded patches to push
    qseries       print the entire series file
    qtop          print the name of the current patch
    qunapplied    print the patches not yet applied
   
   (use "hg help -v mq" to show built-in aliases and global options)
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg ci -Ama
   adding a
 
   $ hg clone . ../k
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ mkdir b
   $ echo z > b/z
   $ hg ci -Ama
   adding b/z
 
 
 qinit
 
   $ hg qinit
 
   $ cd ..
   $ hg init b
 
 
 -R qinit
 
   $ hg -R b qinit
 
   $ hg init c
 
 
 qinit -c
 
   $ hg --cwd c qinit -c
   $ hg -R c/.hg/patches st
   A .hgignore
   A series
 
 
 qinit; qinit -c
 
   $ hg init d
   $ cd d
   $ hg qinit
   $ hg qinit -c
 
 qinit -c should create both files if they don't exist
 
   $ cat .hg/patches/.hgignore
   ^\.hg
   ^\.mq
   syntax: glob
   status
   guards
   $ cat .hg/patches/series
   $ hg qinit -c
   abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
   [255]
   $ cd ..
 
   $ echo '% qinit; <stuff>; qinit -c'
   % qinit; <stuff>; qinit -c
   $ hg init e
   $ cd e
   $ hg qnew A
   $ checkundo qnew
   $ echo foo > foo
   $ hg phase -r qbase
   0: draft
   $ hg add foo
   $ hg qrefresh
   $ hg phase -r qbase
   0: draft
   $ hg qnew B
   $ echo >> foo
   $ hg qrefresh
   $ echo status >> .hg/patches/.hgignore
   $ echo bleh >> .hg/patches/.hgignore
   $ hg qinit -c
   adding .hg/patches/A (glob)
   adding .hg/patches/B (glob)
   $ hg -R .hg/patches status
   A .hgignore
   A A
   A B
   A series
 
 qinit -c shouldn't touch these files if they already exist
 
   $ cat .hg/patches/.hgignore
   status
   bleh
   $ cat .hg/patches/series
   A
   B
 
 add an untracked file
 
   $ echo >> .hg/patches/flaf
 
 status --mq with color (issue2096)
 
   $ hg status --mq --config extensions.color= --config color.mode=ansi --color=always
   \x1b[0;32;1mA \x1b[0m\x1b[0;32;1m.hgignore\x1b[0m (esc)
   \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mA\x1b[0m (esc)
   \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mB\x1b[0m (esc)
   \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mseries\x1b[0m (esc)
   \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mflaf\x1b[0m (esc)
 
 try the --mq option on a command provided by an extension
 
   $ hg purge --mq --verbose --config extensions.purge=
   removing file flaf
 
   $ cd ..
 
 #if no-outer-repo
 
 init --mq without repo
 
   $ mkdir f
   $ cd f
   $ hg init --mq
   abort: there is no Mercurial repository here (.hg not found)
   [255]
   $ cd ..
 
 #endif
 
 init --mq with repo path
 
   $ hg init g
   $ hg init --mq g
   $ test -d g/.hg/patches/.hg
 
 init --mq with nonexistent directory
 
   $ hg init --mq nonexistentdir
   abort: repository nonexistentdir not found!
   [255]
 
 
 init --mq with bundle (non "local")
 
   $ hg -R a bundle --all a.bundle >/dev/null
   $ hg init --mq a.bundle
   abort: only a local queue repository may be initialized
   [255]
 
   $ cd a
 
   $ hg qnew -m 'foo bar' test.patch
 
   $ echo '# comment' > .hg/patches/series.tmp
   $ echo >> .hg/patches/series.tmp # empty line
   $ cat .hg/patches/series >> .hg/patches/series.tmp
   $ mv .hg/patches/series.tmp .hg/patches/series
 
 
 qrefresh
 
   $ echo a >> a
   $ hg qrefresh
   $ cat .hg/patches/test.patch
   foo bar
   
   diff -r [a-f0-9]* a (re)
   --- a/a\t(?P<date>.*) (re)
   \+\+\+ b/a\t(?P<date2>.*) (re)
   @@ -1,1 +1,2 @@
    a
   +a
 
 empty qrefresh
 
   $ hg qrefresh -X a
 
 revision:
 
   $ hg diff -r -2 -r -1
 
 patch:
 
   $ cat .hg/patches/test.patch
   foo bar
   
 
 working dir diff:
 
   $ hg diff --nodates -q
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +a
 
 restore things
 
   $ hg qrefresh
   $ checkundo qrefresh
 
 
 qpop
 
   $ hg qpop
   popping test.patch
   patch queue now empty
   $ checkundo qpop
 
 
 qpush with dump of tag cache
 Dump the tag cache to ensure that it has exactly one head after qpush.
 
-  $ rm -f .hg/cache/tags-visible
+  $ rm -f .hg/cache/tags2-visible
   $ hg tags > /dev/null
 
-.hg/cache/tags-visible (pre qpush):
+.hg/cache/tags2-visible (pre qpush):
 
-  $ cat .hg/cache/tags-visible
+  $ cat .hg/cache/tags2-visible
   1 [\da-f]{40} (re)
   $ hg qpush
   applying test.patch
   now at: test.patch
   $ hg phase -r qbase
   2: draft
   $ hg tags > /dev/null
 
-.hg/cache/tags-visible (post qpush):
+.hg/cache/tags2-visible (post qpush):
 
-  $ cat .hg/cache/tags-visible
+  $ cat .hg/cache/tags2-visible
   2 [\da-f]{40} (re)
   $ checkundo qpush
   $ cd ..
 
 
 pop/push outside repo
   $ hg -R a qpop
   popping test.patch
   patch queue now empty
   $ hg -R a qpush
   applying test.patch
   now at: test.patch
 
   $ cd a
   $ hg qnew test2.patch
 
 qrefresh in subdir
 
   $ cd b
   $ echo a > a
   $ hg add a
   $ hg qrefresh
 
 pop/push -a in subdir
 
   $ hg qpop -a
   popping test2.patch
   popping test.patch
   patch queue now empty
   $ hg --traceback qpush -a
   applying test.patch
   applying test2.patch
   now at: test2.patch
 
 
 setting columns & formatted tests truncating (issue1912)
 
   $ COLUMNS=4 hg qseries --config ui.formatted=true
   test.patch
   test2.patch
   $ COLUMNS=20 hg qseries --config ui.formatted=true -vs
   0 A test.patch: f...
   1 A test2.patch: 
   $ hg qpop
   popping test2.patch
   now at: test.patch
   $ hg qseries -vs
   0 A test.patch: foo bar
   1 U test2.patch: 
   $ hg sum | grep mq
   mq:     1 applied, 1 unapplied
   $ hg qpush
   applying test2.patch
   now at: test2.patch
   $ hg sum | grep mq
   mq:     2 applied
   $ hg qapplied
   test.patch
   test2.patch
   $ hg qtop
   test2.patch
 
 
 prev
 
   $ hg qapp -1
   test.patch
 
 next
 
   $ hg qunapp -1
   all patches applied
   [1]
 
   $ hg qpop
   popping test2.patch
   now at: test.patch
 
 commit should fail
 
   $ hg commit
   abort: cannot commit over an applied mq patch
   [255]
 
 push should fail if draft
 
   $ hg push ../../k
   pushing to ../../k
   abort: source has mq patches applied
   [255]
 
 
 import should fail
 
   $ hg st .
   $ echo foo >> ../a
   $ hg diff > ../../import.diff
   $ hg revert --no-backup ../a
   $ hg import ../../import.diff
   abort: cannot import over an applied patch
   [255]
   $ hg st
 
 import --no-commit should succeed
 
   $ hg import --no-commit ../../import.diff
   applying ../../import.diff
   $ hg st
   M a
   $ hg revert --no-backup ../a
 
 
 qunapplied
 
   $ hg qunapplied
   test2.patch
 
 
 qpush/qpop with index
 
   $ hg qnew test1b.patch
   $ echo 1b > 1b
   $ hg add 1b
   $ hg qrefresh
   $ hg qpush 2
   applying test2.patch
   now at: test2.patch
   $ hg qpop 0
   popping test2.patch
   popping test1b.patch
   now at: test.patch
   $ hg qpush test.patch+1
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush test.patch+2
   applying test2.patch
   now at: test2.patch
   $ hg qpop test2.patch-1
   popping test2.patch
   now at: test1b.patch
   $ hg qpop test2.patch-2
   popping test1b.patch
   now at: test.patch
   $ hg qpush test1b.patch+1
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 
 qpush --move
 
   $ hg qpop -a
   popping test2.patch
   popping test1b.patch
   popping test.patch
   patch queue now empty
   $ hg qguard test1b.patch -- -negguard
   $ hg qguard test2.patch -- +posguard
   $ hg qpush --move test2.patch # can't move guarded patch
   cannot push 'test2.patch' - guarded by '+posguard'
   [1]
   $ hg qselect posguard
   number of unguarded, unapplied patches has changed from 2 to 3
   $ hg qpush --move test2.patch # move to front
   applying test2.patch
   now at: test2.patch
   $ hg qpush --move test1b.patch # negative guard unselected
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush --move test.patch # noop move
   applying test.patch
   now at: test.patch
   $ hg qseries -v
   0 A test2.patch
   1 A test1b.patch
   2 A test.patch
   $ hg qpop -a
   popping test.patch
   popping test1b.patch
   popping test2.patch
   patch queue now empty
 
 cleaning up
 
   $ hg qselect --none
   guards deactivated
   number of unguarded, unapplied patches has changed from 3 to 2
   $ hg qguard --none test1b.patch
   $ hg qguard --none test2.patch
   $ hg qpush --move test.patch
   applying test.patch
   now at: test.patch
   $ hg qpush --move test1b.patch
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush --move bogus # nonexistent patch
   abort: patch bogus not in series
   [255]
   $ hg qpush --move # no patch
   abort: please specify the patch to move
   [255]
   $ hg qpush --move test.patch # already applied
   abort: cannot push to a previous patch: test.patch
   [255]
   $ sed '2i\
   > # make qtip index different in series and fullseries
   > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp
   $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series
   $ cat `hg root`/.hg/patches/series
   # comment
   # make qtip index different in series and fullseries
   
   test.patch
   test1b.patch
   test2.patch
   $ hg qpush --move test2.patch
   applying test2.patch
   now at: test2.patch
 
 
 series after move
 
   $ cat `hg root`/.hg/patches/series
   # comment
   # make qtip index different in series and fullseries
   
   test.patch
   test1b.patch
   test2.patch
 
 
 pop, qapplied, qunapplied
 
   $ hg qseries -v
   0 A test.patch
   1 A test1b.patch
   2 A test2.patch
 
 qapplied -1 test.patch
 
   $ hg qapplied -1 test.patch
   only one patch applied
   [1]
 
 qapplied -1 test1b.patch
 
   $ hg qapplied -1 test1b.patch
   test.patch
 
 qapplied -1 test2.patch
 
   $ hg qapplied -1 test2.patch
   test1b.patch
 
 qapplied -1
 
   $ hg qapplied -1
   test1b.patch
 
 qapplied
 
   $ hg qapplied
   test.patch
   test1b.patch
   test2.patch
 
 qapplied test1b.patch
 
   $ hg qapplied test1b.patch
   test.patch
   test1b.patch
 
 qunapplied -1
 
   $ hg qunapplied -1
   all patches applied
   [1]
 
 qunapplied
 
   $ hg qunapplied
 
 popping
 
   $ hg qpop
   popping test2.patch
   now at: test1b.patch
 
 qunapplied -1
 
   $ hg qunapplied -1
   test2.patch
 
 qunapplied
 
   $ hg qunapplied
   test2.patch
 
 qunapplied test2.patch
 
   $ hg qunapplied test2.patch
 
 qunapplied -1 test2.patch
 
   $ hg qunapplied -1 test2.patch
   all patches applied
   [1]
 
 popping -a
 
   $ hg qpop -a
   popping test1b.patch
   popping test.patch
   patch queue now empty
 
 qapplied
 
   $ hg qapplied
 
 qapplied -1
 
   $ hg qapplied -1
   no patches applied
   [1]
   $ hg qpush
   applying test.patch
   now at: test.patch
 
 
 push should succeed
 
   $ hg qpop -a
   popping test.patch
   patch queue now empty
   $ hg push ../../k
   pushing to ../../k
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 
 we want to start with some patches applied
 
   $ hg qpush -a
   applying test.patch
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 % pops all patches and succeeds
 
   $ hg qpop -a
   popping test2.patch
   popping test1b.patch
   popping test.patch
   patch queue now empty
 
 % does nothing and succeeds
 
   $ hg qpop -a
   no patches applied
 
 % fails - nothing else to pop
 
   $ hg qpop
   no patches applied
   [1]
 
 % pushes a patch and succeeds
 
   $ hg qpush
   applying test.patch
   now at: test.patch
 
 % pops a patch and succeeds
 
   $ hg qpop
   popping test.patch
   patch queue now empty
 
 % pushes up to test1b.patch and succeeds
 
   $ hg qpush test1b.patch
   applying test.patch
   applying test1b.patch
   now at: test1b.patch
 
 % does nothing and succeeds
 
   $ hg qpush test1b.patch
   qpush: test1b.patch is already at the top
 
 % does nothing and succeeds
 
   $ hg qpop test1b.patch
   qpop: test1b.patch is already at the top
 
 % fails - can't push to this patch
 
   $ hg qpush test.patch
   abort: cannot push to a previous patch: test.patch
   [255]
 
 % fails - can't pop to this patch
 
   $ hg qpop test2.patch
   abort: patch test2.patch is not applied
   [255]
 
 % pops up to test.patch and succeeds
 
   $ hg qpop test.patch
   popping test1b.patch
   now at: test.patch
 
 % pushes all patches and succeeds
 
   $ hg qpush -a
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 % does nothing and succeeds
 
   $ hg qpush -a
   all patches are currently applied
 
 % fails - nothing else to push
 
   $ hg qpush
   patch series already fully applied
   [1]
 
 % does nothing and succeeds
 
   $ hg qpush test2.patch
   qpush: test2.patch is already at the top
 
 strip
 
   $ cd ../../b
   $ echo x>x
   $ hg ci -Ama
   adding x
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle .hg/strip-backup/*
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
 
 strip with local changes, should complain
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo y>y
   $ hg add y
   $ hg strip tip
   abort: local changes found
   [255]
 
 --force strip with local changes
 
   $ hg strip -f tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg (glob)
   $ cd ..
 
 
 cd b; hg qrefresh
 
   $ hg init refresh
   $ cd refresh
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ hg qnew -mfoo foo
   $ echo a >> a
   $ hg qrefresh
   $ mkdir b
   $ cd b
   $ echo f > f
   $ hg add f
   $ hg qrefresh
   $ cat ../.hg/patches/foo
   foo
   
   diff -r cb9a9f314b8b a
   --- a/a\t(?P<date>.*) (re)
   \+\+\+ b/a\t(?P<date>.*) (re)
   @@ -1,1 +1,2 @@
    a
   +a
   diff -r cb9a9f314b8b b/f
   --- /dev/null\t(?P<date>.*) (re)
   \+\+\+ b/b/f\t(?P<date>.*) (re)
   @@ -0,0 +1,1 @@
   +f
 
 hg qrefresh .
 
   $ hg qrefresh .
   $ cat ../.hg/patches/foo
   foo
   
   diff -r cb9a9f314b8b b/f
   --- /dev/null\t(?P<date>.*) (re)
   \+\+\+ b/b/f\t(?P<date>.*) (re)
   @@ -0,0 +1,1 @@
   +f
   $ hg status
   M a
 
 
 qpush failure
 
   $ cd ..
   $ hg qrefresh
   $ hg qnew -mbar bar
   $ echo foo > foo
   $ echo bar > bar
   $ hg add foo bar
   $ hg qrefresh
   $ hg qpop -a
   popping bar
   popping foo
   patch queue now empty
   $ echo bar > foo
   $ hg qpush -a
   applying foo
   applying bar
   file foo already exists
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed, unable to continue (try -v)
   patch failed, rejects left in working directory
   errors during apply, please fix and refresh bar
   [2]
   $ hg st
   ? foo
   ? foo.rej
 
 
 mq tags
 
   $ hg log --template '{rev} {tags}\n' -r qparent:qtip
   0 qparent
   1 foo qbase
   2 bar qtip tip
 
 mq revset
 
   $ hg log -r 'mq()' --template '{rev}\n'
   1
   2
   $ hg help revsets | grep -i mq
       "mq()"
         Changesets managed by MQ.
 
 bad node in status
 
   $ hg qpop
   popping bar
   now at: foo
   $ hg strip -qn tip
   $ hg tip
   changeset:   0:cb9a9f314b8b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg branches
   default                        0:cb9a9f314b8b
   $ hg qpop
   no patches applied
   [1]
 
   $ cd ..
 
 
 git patches
 
   $ cat >>$HGRCPATH <<EOF
   > [diff]
   > git = True
   > EOF
   $ hg init git
   $ cd git
   $ hg qinit
 
   $ hg qnew -m'new file' new
   $ echo foo > new
 #if execbit
   $ chmod +x new
 #endif
   $ hg add new
   $ hg qrefresh
 #if execbit
   $ cat .hg/patches/new
   new file
   
   diff --git a/new b/new
   new file mode 100755
   --- /dev/null
   +++ b/new
   @@ -0,0 +1,1 @@
   +foo
 #else
   $ cat .hg/patches/new
   new file
   
   diff --git a/new b/new
   new file mode 100644
   --- /dev/null
   +++ b/new
   @@ -0,0 +1,1 @@
   +foo
 #endif
 
   $ hg qnew -m'copy file' copy
   $ hg cp new copy
   $ hg qrefresh
   $ cat .hg/patches/copy
   copy file
   
   diff --git a/new b/copy
   copy from new
   copy to copy
 
   $ hg qpop
   popping copy
   now at: new
   $ hg qpush
   applying copy
   now at: copy
   $ hg qdiff
   diff --git a/new b/copy
   copy from new
   copy to copy
   $ cat >>$HGRCPATH <<EOF
   > [diff]
   > git = False
   > EOF
   $ hg qdiff --git
   diff --git a/new b/copy
   copy from new
   copy to copy
   $ cd ..
 
 empty lines in status
 
   $ hg init emptystatus
   $ cd emptystatus
   $ hg qinit
   $ printf '\n\n' > .hg/patches/status
   $ hg qser
   $ cd ..
 
 bad line in status (without ":")
 
   $ hg init badstatus
   $ cd badstatus
   $ hg qinit
   $ printf 'babar has no colon in this line\n' > .hg/patches/status
   $ hg qser
   malformated mq status line: ['babar has no colon in this line']
   $ cd ..
 
 
 test file addition in slow path
 
   $ hg init slow
   $ cd slow
   $ hg qinit
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg qnew bar
   $ echo bar > bar
   $ hg add bar
   $ hg mv foo baz
   $ hg qrefresh --git
   $ hg up -C 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo'
   created new head
   $ hg up -C 1
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,1 @@
   +bar
   diff --git a/foo b/baz
   rename from foo
   rename to baz
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   2 baz (foo)
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,1 @@
   +bar
   diff --git a/foo b/baz
   rename from foo
   rename to baz
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   2 baz (foo)
   $ hg qrefresh
   $ grep 'diff --git' .hg/patches/bar
   diff --git a/bar b/bar
   diff --git a/foo b/baz
 
 
 test file move chains in the slow path
 
   $ hg up -C 1
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo again'
   $ hg up -C 2
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv bar quux
   $ hg mv baz bleh
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/foo b/bleh
   rename from foo
   rename to bleh
   diff --git a/quux b/quux
   new file mode 100644
   --- /dev/null
   +++ b/quux
   @@ -0,0 +1,1 @@
   +bar
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   3 bleh (foo)
   $ hg mv quux fred
   $ hg mv bleh barney
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/foo b/barney
   rename from foo
   rename to barney
   diff --git a/fred b/fred
   new file mode 100644
   --- /dev/null
   +++ b/fred
   @@ -0,0 +1,1 @@
   +bar
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   3 barney (foo)
 
 
 refresh omitting an added file
 
   $ hg qnew baz
   $ echo newfile > newfile
   $ hg add newfile
   $ hg qrefresh
   $ hg st -A newfile
   C newfile
   $ hg qrefresh -X newfile
   $ hg st -A newfile
   A newfile
   $ hg revert newfile
   $ rm newfile
   $ hg qpop
   popping baz
   now at: bar
 
 test qdel/qrm
 
   $ hg qdel baz
   $ echo p >> .hg/patches/series
   $ hg qrm p
   $ hg qser
   bar
 
 create a git patch
 
   $ echo a > alexander
   $ hg add alexander
   $ hg qnew -f --git addalexander
   $ grep diff .hg/patches/addalexander
   diff --git a/alexander b/alexander
 
 
 create a git binary patch
 
   $ cat > writebin.py <<EOF
   > import sys
   > path = sys.argv[1]
   > open(path, 'wb').write('BIN\x00ARY')
   > EOF
   $ python writebin.py bucephalus
 
   $ python "$TESTDIR/md5sum.py" bucephalus
   8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
   $ hg add bucephalus
   $ hg qnew -f --git addbucephalus
   $ grep diff .hg/patches/addbucephalus
   diff --git a/bucephalus b/bucephalus
 
 
 check binary patches can be popped and pushed
 
   $ hg qpop
   popping addbucephalus
   now at: addalexander
   $ test -f bucephalus && echo % bucephalus should not be there
   [1]
   $ hg qpush
   applying addbucephalus
   now at: addbucephalus
   $ test -f bucephalus
   $ python "$TESTDIR/md5sum.py" bucephalus
   8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 
 
 
 strip again
 
   $ cd ..
   $ hg init strip
   $ cd strip
   $ touch foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ echo >> foo
   $ hg ci -m 'change foo 1'
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 >> foo
   $ hg ci -m 'change foo 2'
   created new head
   $ HGMERGE=true hg merge
   merging foo
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ hg log
   changeset:   3:99615015637b
   tag:         tip
   parent:      2:20cbbe65cff7
   parent:      1:d2871fc282d4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge
   
   changeset:   2:20cbbe65cff7
   parent:      0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 2
   
   changeset:   1:d2871fc282d4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 1
   
   changeset:   0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ hg strip 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob)
   $ checkundo strip
   $ hg log
   changeset:   1:20cbbe65cff7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 2
   
   changeset:   0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ cd ..
 
 
 qclone
 
   $ qlog()
   > {
   >     echo 'main repo:'
   >     hg log --template '    rev {rev}: {desc}\n'
   >     echo 'patch repo:'
   >     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
   > }
   $ hg init qclonesource
   $ cd qclonesource
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg qinit
   $ hg qnew patch1
   $ echo bar >> foo
   $ hg qrefresh -m 'change foo'
   $ cd ..
 
 
 repo with unversioned patch dir
 
   $ hg qclone qclonesource failure
   abort: versioned patch repository not found (see init --mq)
   [255]
 
   $ cd qclonesource
   $ hg qinit -c
   adding .hg/patches/patch1 (glob)
   $ hg qci -m checkpoint
   $ qlog
   main repo:
       rev 1: change foo
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 repo with patches applied
 
   $ hg qclone qclonesource qclonedest
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd qclonedest
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 repo with patches unapplied
 
   $ cd qclonesource
   $ hg qpop -a
   popping patch1
   patch queue now empty
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
   $ hg qclone qclonesource qclonedest2
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd qclonedest2
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 Issue1033: test applying on an empty file
 
   $ hg init empty
   $ cd empty
   $ touch a
   $ hg ci -Am addempty
   adding a
   $ echo a > a
   $ hg qnew -f -e changea
   $ hg qpop
   popping changea
   patch queue now empty
   $ hg qpush
   applying changea
   now at: changea
   $ cd ..
 
 test qpush with --force, issue1087
 
   $ hg init forcepush
   $ cd forcepush
   $ echo hello > hello.txt
   $ echo bye > bye.txt
   $ hg ci -Ama
   adding bye.txt
   adding hello.txt
   $ hg qnew -d '0 0' empty
   $ hg qpop
   popping empty
   patch queue now empty
   $ echo world >> hello.txt
 
 
 qpush should fail, local changes
 
   $ hg qpush
   abort: local changes found
   [255]
 
 
 apply force, should not discard changes with empty patch
 
   $ hg qpush -f
   applying empty
   patch empty is empty
   now at: empty
   $ hg diff --config diff.nodates=True
   diff -r d58265112590 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,2 @@
    hello
   +world
   $ hg qdiff --config diff.nodates=True
   diff -r 9ecee4f634e3 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,2 @@
    hello
   +world
   $ hg log -l1 -p
   changeset:   1:d58265112590
   tag:         empty
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     imported patch empty
   
   
   $ hg qref -d '0 0'
   $ hg qpop
   popping empty
   patch queue now empty
   $ echo universe >> hello.txt
   $ echo universe >> bye.txt
 
 
 qpush should fail, local changes
 
   $ hg qpush
   abort: local changes found
   [255]
 
 
 apply force, should discard changes in hello, but not bye
 
   $ hg qpush -f --verbose
   applying empty
   saving current version of hello.txt as hello.txt.orig
   patching file hello.txt
   committing files:
   hello.txt
   committing manifest
   committing changelog
   now at: empty
   $ hg st
   M bye.txt
   ? hello.txt.orig
   $ hg diff --config diff.nodates=True
   diff -r ba252371dbc1 bye.txt
   --- a/bye.txt
   +++ b/bye.txt
   @@ -1,1 +1,2 @@
    bye
   +universe
   $ hg qdiff --config diff.nodates=True
   diff -r 9ecee4f634e3 bye.txt
   --- a/bye.txt
   +++ b/bye.txt
   @@ -1,1 +1,2 @@
    bye
   +universe
   diff -r 9ecee4f634e3 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,3 @@
    hello
   +world
   +universe
 
 
 test popping revisions not in working dir ancestry
 
   $ hg qseries -v
   0 A empty
   $ hg up qparent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qpop
   popping empty
   patch queue now empty
 
   $ cd ..
   $ hg init deletion-order
   $ cd deletion-order
 
   $ touch a
   $ hg ci -Aqm0
 
   $ hg qnew rename-dir
   $ hg rm a
   $ hg qrefresh
 
   $ mkdir a b
   $ touch a/a b/b
   $ hg add -q a b
   $ hg qrefresh
 
 
 test popping must remove files added in subdirectories first
 
   $ hg qpop
   popping rename-dir
   patch queue now empty
   $ cd ..
 
 
 test case preservation through patch pushing especially on case
 insensitive filesystem
 
   $ hg init casepreserve
   $ cd casepreserve
 
   $ hg qnew add-file1
   $ echo a > TeXtFiLe.TxT
   $ hg add TeXtFiLe.TxT
   $ hg qrefresh
 
   $ hg qnew add-file2
   $ echo b > AnOtHeRFiLe.TxT
   $ hg add AnOtHeRFiLe.TxT
   $ hg qrefresh
 
   $ hg qnew modify-file
   $ echo c >> AnOtHeRFiLe.TxT
   $ hg qrefresh
 
   $ hg qapplied
   add-file1
   add-file2
   modify-file
   $ hg qpop -a
   popping modify-file
   popping add-file2
   popping add-file1
   patch queue now empty
 
 this qpush causes problems below, if case preservation on case
 insensitive filesystem is not enough:
 (1) unexpected "adding ..." messages are shown
 (2) patching fails in modification of (1) files
 
   $ hg qpush -a
   applying add-file1
   applying add-file2
   applying modify-file
   now at: modify-file
 
 Proper phase default with mq:
 
 1. mq.secret=false
 
   $ rm .hg/store/phaseroots
   $ hg phase 'qparent::'
   -1: public
   0: draft
   1: draft
   2: draft
   $ echo '[mq]' >> $HGRCPATH
   $ echo 'secret=true' >> $HGRCPATH
   $ rm -f .hg/store/phaseroots
   $ hg phase 'qparent::'
   -1: public
   0: secret
   1: secret
   2: secret
 
 Test that qfinish change phase when mq.secret=true
 
   $ hg qfinish qbase
   patch add-file1 finalized without changeset message
   $ hg phase 'all()'
   0: draft
   1: secret
   2: secret
 
 Test that qfinish respect phases.new-commit setting
 
   $ echo '[phases]' >> $HGRCPATH
   $ echo 'new-commit=secret' >> $HGRCPATH
   $ hg qfinish qbase
   patch add-file2 finalized without changeset message
   $ hg phase 'all()'
   0: draft
   1: secret
   2: secret
 
 (restore env for next test)
 
   $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp
   $ cp $TESTTMP/sedtmp $HGRCPATH
   $ hg qimport -r 1 --name  add-file2
 
 Test that qfinish preserve phase when mq.secret=false
 
   $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp
   $ cp $TESTTMP/sedtmp $HGRCPATH
   $ hg qfinish qbase
   patch add-file2 finalized without changeset message
   $ hg phase 'all()'
   0: draft
   1: secret
   2: secret
 
 Test that secret mq patch does not break hgweb
 
   $ cat > hgweb.cgi <<HGWEB
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
   > import cgitb
   > cgitb.enable()
   > app = hgweb('.', 'test')
   > wsgicgi.launch(app)
   > HGWEB
   $ . "$TESTDIR/cgienv"
 #if msys
   $ PATH_INFO=//tags; export PATH_INFO
 #else
   $ PATH_INFO=/tags; export PATH_INFO
 #endif
   $ QUERY_STRING='style=raw'
   $ python hgweb.cgi | grep '^tip'
   tip	[0-9a-f]{40} (re)
 
   $ cd ..
 
 Test interaction with revset (issue4426)
 
   $ hg init issue4426
   $ cd issue4426
 
   $ echo a > a
   $ hg ci -Am a
   adding a
   $ echo a >> a
   $ hg ci -m a
   $ echo a >> a
   $ hg ci -m a
   $ hg qimport -r 0::
 
 reimport things
 
   $ hg qimport -r 1::
   abort: revision 2 is already managed
   [255]
 
 
   $ cd ..

tests/test-obsolete-tag-cache.t

@@ -1,113 +1,113
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > blackbox=
   > rebase=
   > mock=$TESTDIR/mockblackbox.py
   > 
   > [experimental]
   > evolution = createmarkers
   > EOF
 
 Create a repo with some tags
 
   $ hg init repo
   $ cd repo
   $ echo initial > foo
   $ hg -q commit -A -m initial
   $ hg tag -m 'test tag' test1
   $ echo first > first
   $ hg -q commit -A -m first
   $ hg tag -m 'test2 tag' test2
   $ hg -q up -r 0
   $ echo newhead > newhead
   $ hg commit -A -m newhead
   adding newhead
   created new head
   $ hg tag -m 'test head 2 tag' head2
 
   $ hg log -G -T '{rev}:{node|short} {tags} {desc}\n'
   @  5:2942a772f72a tip test head 2 tag
   |
   o  4:042eb6bfcc49 head2 newhead
   |
   | o  3:c3cb30f2d2cd  test2 tag
   | |
   | o  2:d75775ffbc6b test2 first
   | |
   | o  1:5f97d42da03f  test tag
   |/
   o  0:55482a6fb4b1 test1 initial
   
 
 Trigger tags cache population by doing something that accesses tags info
 
   $ hg tags
   tip                                5:2942a772f72a
   head2                              4:042eb6bfcc49
   test2                              2:d75775ffbc6b
   test1                              0:55482a6fb4b1
 
   $ cat .hg/cache/tags2-visible
   5 2942a772f72a444bef4bef13874d515f50fa27b6
   042eb6bfcc4909bad84a1cbf6eb1ddf0ab587d41 head2
   55482a6fb4b1881fa8f746fd52cf6f096bb21c89 test1
   d75775ffbc6bca1794d300f5571272879bd280da test2
 
 Hiding a non-tip changeset should change filtered hash and cause tags recompute
 
   $ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser
 
   $ hg tags
   tip                                5:2942a772f72a
   head2                              4:042eb6bfcc49
   test1                              0:55482a6fb4b1
 
   $ cat .hg/cache/tags2-visible
   5 2942a772f72a444bef4bef13874d515f50fa27b6 f34fbc9a9769ba9eff5aff3d008a6b49f85c08b1
   042eb6bfcc4909bad84a1cbf6eb1ddf0ab587d41 head2
   55482a6fb4b1881fa8f746fd52cf6f096bb21c89 test1
 
   $ hg blackbox -l 4
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> 2/2 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 2 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 2 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
 
 Hiding another changeset should cause the filtered hash to change
 
   $ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser
   $ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser
 
   $ hg tags
   tip                                5:2942a772f72a
   head2                              4:042eb6bfcc49
 
   $ cat .hg/cache/tags2-visible
   5 2942a772f72a444bef4bef13874d515f50fa27b6 2fce1eec33263d08a4d04293960fc73a555230e4
   042eb6bfcc4909bad84a1cbf6eb1ddf0ab587d41 head2
 
   $ hg blackbox -l 4
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> 1/1 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
 
 Resolving tags on an unfiltered repo writes a separate tags cache
 
   $ hg --hidden tags
   tip                                5:2942a772f72a
   head2                              4:042eb6bfcc49
   test2                              2:d75775ffbc6b
   test1                              0:55482a6fb4b1
 
   $ cat .hg/cache/tags2
   5 2942a772f72a444bef4bef13874d515f50fa27b6
   042eb6bfcc4909bad84a1cbf6eb1ddf0ab587d41 head2
   55482a6fb4b1881fa8f746fd52cf6f096bb21c89 test1
   d75775ffbc6bca1794d300f5571272879bd280da test2
 
   $ hg blackbox -l 4
   1970/01/01 00:00:00 bob> --hidden tags
   1970/01/01 00:00:00 bob> 2/2 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 3 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2 with 3 tags
   1970/01/01 00:00:00 bob> --hidden tags exited 0 after * seconds (glob)

tests/test-tags.t

@@ -1,612 +1,612
 setup
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > blackbox=
   > mock=$TESTDIR/mockblackbox.py
   > EOF
 
 Helper functions:
 
   $ cacheexists() {
   >   [ -f .hg/cache/tags2-visible ] && echo "tag cache exists" || echo "no tag cache"
   > }
 
   $ fnodescacheexists() {
   >   [ -f .hg/cache/hgtagsfnodes1 ] && echo "fnodes cache exists" || echo "no fnodes cache"
   > }
 
   $ dumptags() {
   >     rev=$1
   >     echo "rev $rev: .hgtags:"
   >     hg cat -r$rev .hgtags
   > }
 
 # XXX need to test that the tag cache works when we strip an old head
 # and add a new one rooted off non-tip: i.e. node and rev of tip are the
 # same, but stuff has changed behind tip.
 
 Setup:
 
   $ hg init t
   $ cd t
   $ cacheexists
   no tag cache
   $ fnodescacheexists
   no fnodes cache
   $ hg id
   000000000000 tip
   $ cacheexists
   no tag cache
   $ fnodescacheexists
   no fnodes cache
   $ echo a > a
   $ hg add a
   $ hg commit -m "test"
   $ hg co
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg identify
   acb14030fe0a tip
   $ cacheexists
   tag cache exists
 No fnodes cache because .hgtags file doesn't exist
 (this is an implementation detail)
   $ fnodescacheexists
   no fnodes cache
 
 Try corrupting the cache
 
   $ printf 'a b' > .hg/cache/tags2-visible
   $ hg identify
   acb14030fe0a tip
   $ cacheexists
   tag cache exists
   $ fnodescacheexists
   no fnodes cache
   $ hg identify
   acb14030fe0a tip
 
 Create local tag with long name:
 
   $ T=`hg identify --debug --id`
   $ hg tag -l "This is a local tag with a really long name!"
   $ hg tags
   tip                                0:acb14030fe0a
   This is a local tag with a really long name!     0:acb14030fe0a
   $ rm .hg/localtags
 
 Create a tag behind hg's back:
 
   $ echo "$T first" > .hgtags
   $ cat .hgtags
   acb14030fe0a21b60322c440ad2d20cf7685a376 first
   $ hg add .hgtags
   $ hg commit -m "add tags"
   $ hg tags
   tip                                1:b9154636be93
   first                              0:acb14030fe0a
   $ hg identify
   b9154636be93 tip
 
 We should have a fnodes cache now that we have a real tag
 The cache should have an empty entry for rev 0 and a valid entry for rev 1.
 
 
   $ fnodescacheexists
   fnodes cache exists
   $ f --size --hexdump .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=48
   0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
   0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
 
 Repeat with cold tag cache:
 
   $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ hg identify
   b9154636be93 tip
 
   $ fnodescacheexists
   fnodes cache exists
   $ f --size --hexdump .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=48
   0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
   0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
 
 And again, but now unable to write tag cache:
 
 #if unix-permissions
   $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ chmod 555 .hg/cache
   $ hg identify
   b9154636be93 tip
   $ chmod 755 .hg/cache
 #endif
 
 Tag cache debug info written to blackbox log
 
   $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ hg identify
   b9154636be93 tip
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> identify
   1970/01/01 00:00:00 bob> writing 48 bytes to cache/hgtagsfnodes1
   1970/01/01 00:00:00 bob> 0/1 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> identify exited 0 after ?.?? seconds (glob)
 
 Failure to acquire lock results in no write
 
   $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ echo 'foo:1' > .hg/wlock
   $ hg identify
   b9154636be93 tip
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> identify
   1970/01/01 00:00:00 bob> not writing .hg/cache/hgtagsfnodes1 because lock held
   1970/01/01 00:00:00 bob> 0/1 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> identify exited 0 after * seconds (glob)
 
   $ fnodescacheexists
   no fnodes cache
 
   $ rm .hg/wlock
 
   $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1
   $ hg identify
   b9154636be93 tip
 
 Create a branch:
 
   $ echo bb > a
   $ hg status
   M a
   $ hg identify
   b9154636be93+ tip
   $ hg co first
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg id
   acb14030fe0a+ first
   $ hg -v id
   acb14030fe0a+ first
   $ hg status
   M a
   $ echo 1 > b
   $ hg add b
   $ hg commit -m "branch"
   created new head
 
 Creating a new commit shouldn't append the .hgtags fnodes cache until
 tags info is accessed
 
   $ f --size --hexdump .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=48
   0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
   0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
 
   $ hg id
   c8edf04160c7 tip
 
 First 4 bytes of record 3 are changeset fragment
 
   $ f --size --hexdump .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=72
   0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...|
   0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y|
   0030: c8 ed f0 41 00 00 00 00 00 00 00 00 00 00 00 00 |...A............|
   0040: 00 00 00 00 00 00 00 00                         |........|
 
 Merge the two heads:
 
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg id
   c8edf04160c7+b9154636be93+ tip
   $ hg status
   M .hgtags
   $ hg commit -m "merge"
 
 Create a fake head, make sure tag not visible afterwards:
 
   $ cp .hgtags tags
   $ hg tag last
   $ hg rm .hgtags
   $ hg commit -m "remove"
 
   $ mv tags .hgtags
   $ hg add .hgtags
   $ hg commit -m "readd"
   $ 
   $ hg tags
   tip                                6:35ff301afafe
   first                              0:acb14030fe0a
 
 Add invalid tags:
 
   $ echo "spam" >> .hgtags
   $ echo >> .hgtags
   $ echo "foo bar" >> .hgtags
   $ echo "a5a5 invalid" >> .hg/localtags
   $ cat .hgtags
   acb14030fe0a21b60322c440ad2d20cf7685a376 first
   spam
   
   foo bar
   $ hg commit -m "tags"
 
 Report tag parse error on other head:
 
   $ hg up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'x y' >> .hgtags
   $ hg commit -m "head"
   created new head
 
   $ hg tags
   .hgtags@75d9f02dfe28, line 2: cannot parse entry
   .hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
   .hgtags@c4be69a18c11, line 2: node 'x' is not well formed
   tip                                8:c4be69a18c11
   first                              0:acb14030fe0a
   $ hg tip
   changeset:   8:c4be69a18c11
   tag:         tip
   parent:      3:ac5e980c4dc0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     head
   
 
 Test tag precedence rules:
 
   $ cd ..
   $ hg init t2
   $ cd t2
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'      # rev 0
   $ hg tag bar              # rev 1
   $ echo >> foo
   $ hg ci -m 'change foo 1' # rev 2
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag -r 1 -f bar      # rev 3
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo 2' # rev 4
   created new head
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
 Repeat in case of cache effects:
 
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
 Detailed dump of tag info:
 
   $ hg heads -q             # expect 4, 3, 2
   4:0c192d7d5e6b
   3:6fa450212aeb
   2:7a94127795a3
   $ dumptags 2
   rev 2: .hgtags:
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   $ dumptags 3
   rev 3: .hgtags:
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   78391a272241d70354aa14c874552cad6b51bb42 bar
   $ dumptags 4
   rev 4: .hgtags:
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
 
 Dump cache:
 
   $ cat .hg/cache/tags2-visible
   4 0c192d7d5e6b78a714de54a2e9627952a877e25a
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   78391a272241d70354aa14c874552cad6b51bb42 bar
 
   $ f --size --hexdump .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=120
   0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
   0030: 7a 94 12 77 0c 04 f2 a8 af 31 de 17 fa b7 42 28 |z..w.....1....B(|
   0040: 78 ee 5a 2d ad bc 94 3d 6f a4 50 21 7d 3b 71 8c |x.Z-...=o.P!};q.|
   0050: 96 4e f3 7b 89 e5 50 eb da fd 57 89 e7 6c e1 b0 |.N.{..P...W..l..|
   0060: 0c 19 2d 7d 0c 04 f2 a8 af 31 de 17 fa b7 42 28 |..-}.....1....B(|
   0070: 78 ee 5a 2d ad bc 94 3d                         |x.Z-...=|
 
 Corrupt the .hgtags fnodes cache
 Extra junk data at the end should get overwritten on next cache update
 
   $ echo extra >> .hg/cache/hgtagsfnodes1
   $ echo dummy1 > foo
   $ hg commit -m throwaway1
 
   $ hg tags
   tip                                5:8dbfe60eff30
   bar                                1:78391a272241
 
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> writing 24 bytes to cache/hgtagsfnodes1
   1970/01/01 00:00:00 bob> 2/3 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
 
 #if unix-permissions no-root
 Errors writing to .hgtags fnodes cache are silently ignored
 
   $ echo dummy2 > foo
   $ hg commit -m throwaway2
 
   $ chmod a-w .hg/cache/hgtagsfnodes1
   $ rm -f .hg/cache/tags2-visible
 
   $ hg tags
   tip                                6:b968051b5cf3
   bar                                1:78391a272241
 
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> couldn't write cache/hgtagsfnodes1: [Errno 13] Permission denied: '$TESTTMP/t2/.hg/cache/hgtagsfnodes1'
   1970/01/01 00:00:00 bob> 2/3 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
 
   $ chmod a+w .hg/cache/hgtagsfnodes1
 #endif
 
   $ rm -f .hg/cache/tags2-visible
   $ hg tags
   tip                                6:b968051b5cf3
   bar                                1:78391a272241
 
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> writing 24 bytes to cache/hgtagsfnodes1
   1970/01/01 00:00:00 bob> 2/3 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
 
   $ f --size .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=168
 
 Stripping doesn't truncate the tags cache until new data is available
 
   $ hg -q --config extensions.strip= strip -r 5 --no-backup
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
   $ hg blackbox -l 4
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> 3/3 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
 
   $ f --size .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=168
 
   $ echo dummy > foo
   $ hg commit -m throwaway3
 
   $ hg tags
   tip                                5:035f65efb448
   bar                                1:78391a272241
 
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> tags
   1970/01/01 00:00:00 bob> writing 24 bytes to cache/hgtagsfnodes1
   1970/01/01 00:00:00 bob> 2/3 cache hits/lookups in * seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 1 tags
+  1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags
   1970/01/01 00:00:00 bob> tags exited 0 after * seconds (glob)
   $ f --size .hg/cache/hgtagsfnodes1
   .hg/cache/hgtagsfnodes1: size=144
 
   $ hg -q --config extensions.strip= strip -r 5 --no-backup
 
 Test tag removal:
 
   $ hg tag --remove bar     # rev 5
   $ hg tip -vp
   changeset:   5:5f6e8655b1c7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       .hgtags
   description:
   Removed tag bar
   
   
   diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags
   --- a/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   +78391a272241d70354aa14c874552cad6b51bb42 bar
   +0000000000000000000000000000000000000000 bar
   
   $ hg tags
   tip                                5:5f6e8655b1c7
   $ hg tags                 # again, try to expose cache bugs
   tip                                5:5f6e8655b1c7
 
 Remove nonexistent tag:
 
   $ hg tag --remove foobar
   abort: tag 'foobar' does not exist
   [255]
   $ hg tip
   changeset:   5:5f6e8655b1c7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Removed tag bar
   
 
 Undo a tag with rollback:
 
   $ hg rollback             # destroy rev 5 (restore bar)
   repository tip rolled back to revision 4 (undo commit)
   working directory now based on revision 4
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
 Test tag rank:
 
   $ cd ..
   $ hg init t3
   $ cd t3
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'       # rev 0
   $ hg tag -f bar            # rev 1 bar -> 0
   $ hg tag -f bar            # rev 2 bar -> 1
   $ hg tag -fr 0 bar         # rev 3 bar -> 0
   $ hg tag -fr 1 bar         # rev 4 bar -> 1
   $ hg tag -fr 0 bar         # rev 5 bar -> 0
   $ hg tags
   tip                                5:85f05169d91d
   bar                                0:bbd179dfa0a7
   $ hg co 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo barbar > foo
   $ hg ci -m 'change foo'    # rev 6
   created new head
   $ hg tags
   tip                                6:735c3ca72986
   bar                                0:bbd179dfa0a7
 
 Don't allow moving tag without -f:
 
   $ hg tag -r 3 bar
   abort: tag 'bar' already exists (use -f to force)
   [255]
   $ hg tags
   tip                                6:735c3ca72986
   bar                                0:bbd179dfa0a7
 
 Strip 1: expose an old head:
 
   $ hg --config extensions.mq= strip 5
   saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
   $ hg tags                  # partly stale cache
   tip                                5:735c3ca72986
   bar                                1:78391a272241
   $ hg tags                  # up-to-date cache
   tip                                5:735c3ca72986
   bar                                1:78391a272241
 
 Strip 2: destroy whole branch, no old head exposed
 
   $ hg --config extensions.mq= strip 4
   saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
   $ hg tags                  # partly stale
   tip                                4:735c3ca72986
   bar                                0:bbd179dfa0a7
   $ rm -f .hg/cache/tags2-visible
   $ hg tags                  # cold cache
   tip                                4:735c3ca72986
   bar                                0:bbd179dfa0a7
 
 Test tag rank with 3 heads:
 
   $ cd ..
   $ hg init t4
   $ cd t4
   $ echo foo > foo
   $ hg add
   adding foo
   $ hg ci -m 'add foo'                 # rev 0
   $ hg tag bar                         # rev 1 bar -> 0
   $ hg tag -f bar                      # rev 2 bar -> 1
   $ hg up -qC 0
   $ hg tag -fr 2 bar                   # rev 3 bar -> 2
   $ hg tags
   tip                                3:197c21bbbf2c
   bar                                2:6fa450212aeb
   $ hg up -qC 0
   $ hg tag -m 'retag rev 0' -fr 0 bar  # rev 4 bar -> 0, but bar stays at 2
 
 Bar should still point to rev 2:
 
   $ hg tags
   tip                                4:3b4b14ed0202
   bar                                2:6fa450212aeb
 
 Test that removing global/local tags does not get confused when trying
 to remove a tag of type X which actually only exists as a type Y:
 
   $ cd ..
   $ hg init t5
   $ cd t5
   $ echo foo > foo
   $ hg add
   adding foo
   $ hg ci -m 'add foo'                 # rev 0
 
   $ hg tag -r 0 -l localtag
   $ hg tag --remove localtag
   abort: tag 'localtag' is not a global tag
   [255]
   $ 
   $ hg tag -r 0 globaltag
   $ hg tag --remove -l globaltag
   abort: tag 'globaltag' is not a local tag
   [255]
   $ hg tags -v
   tip                                1:a0b6fe111088
   localtag                           0:bbd179dfa0a7 local
   globaltag                          0:bbd179dfa0a7
 
 Test for issue3911
 
   $ hg tag -r 0 -l localtag2
   $ hg tag -l --remove localtag2
   $ hg tags -v
   tip                                1:a0b6fe111088
   localtag                           0:bbd179dfa0a7 local
   globaltag                          0:bbd179dfa0a7
 
   $ hg tag -r 1 -f localtag
   $ hg tags -v
   tip                                2:5c70a037bb37
   localtag                           1:a0b6fe111088
   globaltag                          0:bbd179dfa0a7
 
   $ hg tags -v
   tip                                2:5c70a037bb37
   localtag                           1:a0b6fe111088
   globaltag                          0:bbd179dfa0a7
 
   $ hg tag -r 1 localtag2
   $ hg tags -v
   tip                                3:bbfb8cd42be2
   localtag2                          1:a0b6fe111088
   localtag                           1:a0b6fe111088
   globaltag                          0:bbd179dfa0a7
 
   $ hg tags -v
   tip                                3:bbfb8cd42be2
   localtag2                          1:a0b6fe111088
   localtag                           1:a0b6fe111088
   globaltag                          0:bbd179dfa0a7
 
   $ cd ..