outgoing: display info about secret changets while no sharable changeset found

mercurial/hg.py

@@ -1,584 +1,588
 # 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 version 2 or any later version.
 
 from i18n import _
 from lock import release
 from node import hex, nullid
 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo, bookmarks
 import lock, util, extensions, error, node
 import cmdutil, discovery
 import merge as mergemod
 import verify as verifymod
 import errno, os, shutil
 
 def _local(path):
     path = util.expandpath(util.urllocalpath(path))
     return (os.path.isfile(path) and bundlerepo or localrepo)
 
 def addbranchrevs(lrepo, repo, branches, revs):
     hashbranch, branches = branches
     if not hashbranch and not branches:
         return revs or None, revs and revs[0] or None
     revs = revs and list(revs) or []
     if not repo.capable('branchmap'):
         if branches:
             raise util.Abort(_("remote branch lookup not supported"))
         revs.append(hashbranch)
         return revs, revs[0]
     branchmap = repo.branchmap()
 
     def primary(branch):
         if branch == '.':
             if not lrepo or not lrepo.local():
                 raise util.Abort(_("dirstate branch not accessible"))
             branch = lrepo.dirstate.branch()
         if branch in branchmap:
             revs.extend(node.hex(r) for r in reversed(branchmap[branch]))
             return True
         else:
             return False
 
     for branch in branches:
         if not primary(branch):
             raise error.RepoLookupError(_("unknown branch '%s'") % branch)
     if hashbranch:
         if not primary(hashbranch):
             revs.append(hashbranch)
     return revs, revs[0]
 
 def parseurl(path, branches=None):
     '''parse url#branch, returning (url, (branch, branches))'''
 
     u = util.url(path)
     branch = None
     if u.fragment:
         branch = u.fragment
         u.fragment = None
     return str(u), (branch, branches or [])
 
 schemes = {
     'bundle': bundlerepo,
     'file': _local,
     'http': httprepo,
     'https': httprepo,
     'ssh': sshrepo,
     'static-http': statichttprepo,
 }
 
 def _peerlookup(path):
     u = util.url(path)
     scheme = u.scheme or 'file'
     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 _peerlookup(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 = _peerlookup(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 peer(uiorrepo, opts, path, create=False):
     '''return a repository peer for the specified path'''
     rui = remoteui(uiorrepo, opts)
     return repository(rui, path, create)
 
 def defaultdest(source):
     '''return default destination of clone if none is given'''
     return os.path.basename(os.path.normpath(source))
 
 def share(ui, source, dest=None, update=True):
     '''create a shared repository'''
 
     if not islocal(source):
         raise util.Abort(_('can only share local repositories'))
 
     if not dest:
         dest = defaultdest(source)
     else:
         dest = ui.expandpath(dest)
 
     if isinstance(source, str):
         origsource = ui.expandpath(source)
         source, branches = parseurl(origsource)
         srcrepo = repository(ui, source)
         rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
     else:
         srcrepo = source
         origsource = source = srcrepo.url()
         checkout = None
 
     sharedpath = srcrepo.sharedpath # if our source is already sharing
 
     root = os.path.realpath(dest)
     roothg = os.path.join(root, '.hg')
 
     if os.path.exists(roothg):
         raise util.Abort(_('destination already exists'))
 
     if not os.path.isdir(root):
         os.mkdir(root)
     util.makedir(roothg, notindexed=True)
 
     requirements = ''
     try:
         requirements = srcrepo.opener.read('requires')
     except IOError, inst:
         if inst.errno != errno.ENOENT:
             raise
 
     requirements += 'shared\n'
     util.writefile(os.path.join(roothg, 'requires'), requirements)
     util.writefile(os.path.join(roothg, 'sharedpath'), sharedpath)
 
     r = repository(ui, root)
 
     default = srcrepo.ui.config('paths', 'default')
     if default:
         fp = r.opener("hgrc", "w", text=True)
         fp.write("[paths]\n")
         fp.write("default = %s\n" % default)
         fp.close()
 
     if update:
         r.ui.status(_("updating working directory\n"))
         if update is not True:
             checkout = update
         for test in (checkout, 'default', 'tip'):
             if test is None:
                 continue
             try:
                 uprev = r.lookup(test)
                 break
             except error.RepoLookupError:
                 continue
         _update(r, uprev)
 
 def copystore(ui, srcrepo, destpath):
     '''copy files from store of srcrepo in destpath
 
     returns destlock
     '''
     destlock = None
     try:
         hardlink = None
         num = 0
         srcpublishing = srcrepo.ui.configbool('phases', 'publish', True)
         for f in srcrepo.store.copylist():
             if srcpublishing and f.endswith('phaseroots'):
                 continue
             src = os.path.join(srcrepo.sharedpath, f)
             dst = os.path.join(destpath, 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
                     destlock = lock.lock(os.path.join(dstbase, "lock"))
                 hardlink, n = util.copyfiles(src, dst, hardlink)
                 num += n
         if hardlink:
             ui.debug("linked %d files\n" % num)
         else:
             ui.debug("copied %d files\n" % num)
         return destlock
     except:
         release(destlock)
         raise
 
 def clone(ui, peeropts, source, dest=None, pull=False, rev=None,
           update=True, stream=False, branch=None):
     """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)
 
     branch: branches to clone
     """
 
     if isinstance(source, str):
         origsource = ui.expandpath(source)
         source, branch = parseurl(origsource, branch)
         srcrepo = repository(remoteui(ui, peeropts), source)
     else:
         srcrepo = source
         branch = (None, branch or [])
         origsource = source = srcrepo.url()
     rev, checkout = addbranchrevs(srcrepo, srcrepo, branch, rev)
 
     if dest is None:
         dest = defaultdest(source)
         ui.status(_("destination directory: %s\n") % dest)
     else:
         dest = ui.expandpath(dest)
 
     dest = util.urllocalpath(dest)
     source = util.urllocalpath(source)
 
     if os.path.exists(dest):
         if not os.path.isdir(dest):
             raise util.Abort(_("destination '%s' already exists") % dest)
         elif os.listdir(dest):
             raise util.Abort(_("destination '%s' is not empty") % dest)
 
     class DirCleanup(object):
         def __init__(self, dir_):
             self.rmtree = shutil.rmtree
             self.dir_ = dir_
         def close(self):
             self.dir_ = None
         def cleanup(self):
             if self.dir_:
                 self.rmtree(self.dir_, True)
 
     srclock = destlock = dircleanup = None
     try:
         abspath = origsource
         if islocal(origsource):
             abspath = os.path.abspath(util.urllocalpath(origsource))
 
         if islocal(dest):
             dircleanup = DirCleanup(dest)
 
         copy = False
         if srcrepo.cancopy() and islocal(dest):
             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
                 srclock = srcrepo.lock(wait=False)
             except error.LockError:
                 copy = False
 
         if copy:
             srcrepo.hook('preoutgoing', throw=True, source='clone')
             hgdir = os.path.realpath(os.path.join(dest, ".hg"))
             if not os.path.exists(dest):
                 os.mkdir(dest)
             else:
                 # only clean up directories we create ourselves
                 dircleanup.dir_ = hgdir
             try:
                 destpath = hgdir
                 util.makedir(destpath, notindexed=True)
             except OSError, inst:
                 if inst.errno == errno.EEXIST:
                     dircleanup.close()
                     raise util.Abort(_("destination '%s' already exists")
                                      % dest)
                 raise
 
             destlock = copystore(ui, srcrepo, destpath)
 
             # we need to re-init the repo after manually copying the data
             # into it
             destrepo = repository(remoteui(ui, peeropts), dest)
             srcrepo.hook('outgoing', source='clone',
                           node=node.hex(node.nullid))
         else:
             try:
                 destrepo = repository(remoteui(ui, peeropts), dest,
                                       create=True)
             except OSError, inst:
                 if inst.errno == errno.EEXIST:
                     dircleanup.close()
                     raise util.Abort(_("destination '%s' already exists")
                                      % dest)
                 raise
 
             revs = None
             if rev:
                 if not srcrepo.capable('lookup'):
                     raise util.Abort(_("src repository does not support "
                                        "revision lookup and so doesn't "
                                        "support clone by revision"))
                 revs = [srcrepo.lookup(r) for r in rev]
                 checkout = revs[0]
             if destrepo.local():
                 destrepo.clone(srcrepo, heads=revs, stream=stream)
             elif srcrepo.local():
                 srcrepo.push(destrepo, revs=revs)
             else:
                 raise util.Abort(_("clone from remote to remote not supported"))
 
         if dircleanup:
             dircleanup.close()
 
         # clone all bookmarks
         if destrepo.local() and srcrepo.capable("pushkey"):
             rb = srcrepo.listkeys('bookmarks')
             for k, n in rb.iteritems():
                 try:
                     m = destrepo.lookup(n)
                     destrepo._bookmarks[k] = m
                 except error.RepoLookupError:
                     pass
             if rb:
                 bookmarks.write(destrepo)
         elif srcrepo.local() and destrepo.capable("pushkey"):
             for k, n in srcrepo._bookmarks.iteritems():
                 destrepo.pushkey('bookmarks', k, '', hex(n))
 
         if destrepo.local():
             fp = destrepo.opener("hgrc", "w", text=True)
             fp.write("[paths]\n")
             u = util.url(abspath)
             u.passwd = None
             defaulturl = str(u)
             fp.write("default = %s\n" % defaulturl)
             fp.close()
 
             destrepo.ui.setconfig('paths', 'default', defaulturl)
 
             if update:
                 if update is not True:
                     checkout = update
                     if srcrepo.local():
                         checkout = srcrepo.lookup(update)
                 for test in (checkout, 'default', 'tip'):
                     if test is None:
                         continue
                     try:
                         uprev = destrepo.lookup(test)
                         break
                     except error.RepoLookupError:
                         continue
                 bn = destrepo[uprev].branch()
                 destrepo.ui.status(_("updating to branch %s\n") % bn)
                 _update(destrepo, uprev)
 
         return srcrepo, destrepo
     finally:
         release(srclock, destlock)
         if dircleanup is not None:
             dircleanup.cleanup()
 
 def _showstats(repo, stats):
     repo.ui.status(_("%d files updated, %d files merged, "
                      "%d files removed, %d files unresolved\n") % stats)
 
 def update(repo, node):
     """update the working directory to node, merging linear changes"""
     stats = mergemod.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 = mergemod.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. Return true if any
     unresolved conflicts."""
     stats = mergemod.update(repo, node, True, force, False)
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                          "or 'hg update -C .' to abandon\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0
 
 def _incoming(displaychlist, subreporecurse, ui, repo, source,
         opts, buffered=False):
     """
     Helper for incoming / gincoming.
     displaychlist gets called with
         (remoterepo, incomingchangesetlist, displayer) parameters,
     and is supposed to contain only code that can't be unified.
     """
     source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
     other = peer(repo, opts, source)
     ui.status(_('comparing with %s\n') % util.hidepassword(source))
     revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
 
     if revs:
         revs = [other.lookup(rev) for rev in revs]
     other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other,
                                 revs, opts["bundle"], opts["force"])
     try:
         if not chlist:
             ui.status(_("no changes found\n"))
             return subreporecurse()
 
         displayer = cmdutil.show_changeset(ui, other, opts, buffered)
 
         # XXX once graphlog extension makes it into core,
         # should be replaced by a if graph/else
         displaychlist(other, chlist, displayer)
 
         displayer.close()
     finally:
         cleanupfn()
     subreporecurse()
     return 0 # exit code is zero since we found incoming changes
 
 def incoming(ui, repo, source, opts):
     def subreporecurse():
         ret = 1
         if opts.get('subrepos'):
             ctx = repo[None]
             for subpath in sorted(ctx.substate):
                 sub = ctx.sub(subpath)
                 ret = min(ret, sub.incoming(ui, source, opts))
         return ret
 
     def display(other, chlist, displayer):
         limit = cmdutil.loglimit(opts)
         if opts.get('newest_first'):
             chlist.reverse()
         count = 0
         for n in chlist:
             if limit is not None and count >= limit:
                 break
             parents = [p for p in other.changelog.parents(n) if p != nullid]
             if opts.get('no_merges') and len(parents) == 2:
                 continue
             count += 1
             displayer.show(other[n])
     return _incoming(display, subreporecurse, ui, repo, source, opts)
 
 def _outgoing(ui, repo, dest, opts):
     dest = ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = parseurl(dest, opts.get('branch'))
     ui.status(_('comparing with %s\n') % util.hidepassword(dest))
     revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
     if revs:
         revs = [repo.lookup(rev) for rev in revs]
 
     other = peer(repo, opts, dest)
     outgoing = discovery.findcommonoutgoing(repo, other, revs,
                                             force=opts.get('force'))
     o = outgoing.missing
     if not o:
-        ui.status(_("no changes found\n"))
+        if outgoing.excluded:
+            repo.ui.status(_("no outgoing changes but %i secret changesets\n")
+                           % len(outgoing.excluded))
+        else:
+            ui.status(_("no changes found\n"))
         return None
     return o
 
 def outgoing(ui, repo, dest, opts):
     def recurse():
         ret = 1
         if opts.get('subrepos'):
             ctx = repo[None]
             for subpath in sorted(ctx.substate):
                 sub = ctx.sub(subpath)
                 ret = min(ret, sub.outgoing(ui, dest, opts))
         return ret
 
     limit = cmdutil.loglimit(opts)
     o = _outgoing(ui, repo, dest, opts)
     if o is None:
         return recurse()
 
     if opts.get('newest_first'):
         o.reverse()
     displayer = cmdutil.show_changeset(ui, repo, opts)
     count = 0
     for n in o:
         if limit is not None and count >= limit:
             break
         parents = [p for p in repo.changelog.parents(n) if p != nullid]
         if opts.get('no_merges') and len(parents) == 2:
             continue
         count += 1
         displayer.show(repo[n])
     displayer.close()
     recurse()
     return 0 # exit code is zero since we found outgoing changes
 
 def revert(repo, node, choose):
     """revert changes to revision in node without updating dirstate"""
     return mergemod.update(repo, node, False, True, choose)[3] > 0
 
 def verify(repo):
     """verify the consistency of a repository"""
     return verifymod.verify(repo)
 
 def remoteui(src, opts):
     'build a remote ui from ui or repo and opts'
     if util.safehasattr(src, 'baseui'): # looks like a repository
         dst = src.baseui.copy() # drop repo-specific config
         src = src.ui # copy target options from repo
     else: # assume it's a global ui object
         dst = src.copy() # keep all global options
 
     # copy ssh-specific options
     for o in 'ssh', 'remotecmd':
         v = opts.get(o) or src.config('ui', o)
         if v:
             dst.setconfig("ui", o, v)
 
     # copy bundle-specific options
     r = src.config('bundle', 'mainreporoot')
     if r:
         dst.setconfig('bundle', 'mainreporoot', r)
 
     # copy selected local settings to the remote ui
     for sect in ('auth', 'hostfingerprints', 'http_proxy'):
         for key, val in src.configitems(sect):
             dst.setconfig(sect, key, val)
     v = src.config('web', 'cacerts')
     if v:
         dst.setconfig('web', 'cacerts', util.expandpath(v))
 
     return dst

tests/test-incoming-outgoing.t

@@ -1,482 +1,491
   $ "$TESTDIR/hghave" serve || exit 80
 
   $ hg init test
   $ cd test
   $ for i in 0 1 2 3 4 5 6 7 8; do
   >     echo $i >> foo
   >     hg commit -A -m $i
   > done
   adding foo
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 9 changesets, 9 total revisions
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
   $ hg init new
 
 http incoming
 
   $ hg -R new incoming http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming -r 4 http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 local incoming
 
   $ hg -R new incoming test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming -r 4 test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
 
 limit to 2 changesets
 
   $ hg -R new incoming -l 2 test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
 
 limit to 2 changesets, test with -p --git
 
   $ hg -R new incoming -l 2 -p --git test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,1 @@
   +0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -1,1 +1,2 @@
    0
   +1
   
 
 test with --bundle
 
   $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R new incoming --bundle test2.hg test
   comparing with test
   changeset:   0:00a43fa82f62
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0
   
   changeset:   1:5460a410df01
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:d9f42cd1a1ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:376476025137
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:70d7eb252d49
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:ad284ee3b5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   6:e9229f2de384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     6
   
   changeset:   7:d152815bb8db
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     7
   
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
 
 
 test the resulting bundles
 
   $ hg init temp
   $ hg init temp2
   $ hg -R temp unbundle test.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg -R temp2 unbundle test2.hg
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 9 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hg -R temp tip
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
   $ hg -R temp2 tip
   changeset:   8:e4feb4ac9035
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     8
   
 
   $ rm -r temp temp2 new
 
 test outgoing
 
   $ hg clone test test-dev
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test-dev
   $ for i in 9 10 11 12 13; do
   >     echo $i >> foo
   >     hg commit -A -m $i
   > done
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 14 changesets, 14 total revisions
   $ cd ..
   $ hg -R test-dev outgoing test
   comparing with test
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   changeset:   12:e576b1bed305
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     12
   
   changeset:   13:96bbff09a7cc
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     13
   
+test outgoing with secret changesets
+
+  $ hg -R test-dev phase --force --secret 9
+  $ hg -R test-dev outgoing test
+  comparing with test
+  searching for changes
+  no outgoing changes but 5 secret changesets
+  [1]
+  $ hg -R test-dev phase --draft -r 'head()'
 
 limit to 3 changesets
 
   $ hg -R test-dev outgoing -l 3 test
   comparing with test
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   $ hg -R test-dev outgoing http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
   changeset:   12:e576b1bed305
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     12
   
   changeset:   13:96bbff09a7cc
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     13
   
   $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/
   comparing with http://localhost:$HGPORT/
   searching for changes
   changeset:   9:d89d4abea5bc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9
   
   changeset:   10:820095aa7158
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     10
   
   changeset:   11:09ede2f3a638
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11
   
 
 incoming from empty remote repository
 
   $ hg init r1
   $ hg init r2
   $ echo a > r1/foo
   $ hg -R r1 ci -Ama
   adding foo
   $ hg -R r1 incoming r2 --bundle x.hg
   comparing with r2
   searching for changes
   no changes found
   [1]