Commits

Martin Geisler committed db2214e

rebased to 9cb1a42cd4b3

Comments (0)

Files changed (1)

 # HG changeset patch
 # User Henrik Stuart <hg@hstuart.dk>
 # Date 1297282594 -3600
-# Node ID dfe072e308fca81eb0aa9c207bf98f02bcc44928
-# Parent  b8b881f3f3a78c0b22015c91cf2500835e630e4a
+# Node ID 2cc18cf3f6f3b0ed0b75eda93af6f427483ba039
+# Parent  9cb1a42cd4b3e90d30cf3f921f12b23401cccc68
 add support for marking changesets as dead
 
 Marking a changeset as dead is, if it is a head, a way to delete a
 diff --git a/mercurial/commands.py b/mercurial/commands.py
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -583,7 +583,7 @@
+@@ -605,7 +605,7 @@
      else:
          ui.write("%s\n" % repo.dirstate.branch())
  
      """list repository named branches
  
      List the repository's named branches, indicating which ones are
-@@ -603,7 +603,8 @@
+@@ -625,7 +625,8 @@
      def testactive(tag, node):
          realhead = tag in activebranches
          open = node in repo.branchheads(tag, closed=False)
      branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
                            for tag, node in repo.branchtags().items()],
                        reverse=True)
-@@ -622,6 +623,10 @@
+@@ -644,6 +645,10 @@
                          continue
                      label = 'branches.closed'
                      notice = _(' (closed)')
                  else:
                      label = 'branches.inactive'
                      notice = _(' (inactive)')
-@@ -818,11 +823,11 @@
+@@ -840,11 +845,11 @@
          raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
  
      r = hg.clone(hg.remoteui(ui, opts), source, dest,
  
      return r is None
  
-@@ -855,6 +860,10 @@
+@@ -877,6 +882,10 @@
              # current branch, so it's sufficient to test branchheads
              raise util.Abort(_('can only close branch heads'))
          extra['close'] = 1
      e = cmdutil.commiteditor
      if opts.get('force_editor'):
          e = cmdutil.commitforceeditor
-@@ -1910,7 +1919,7 @@
+@@ -1932,7 +1941,7 @@
          start = cmdutil.revsingle(repo, opts['rev'], None).node()
  
      if opts.get('topo'):
      else:
          heads = []
          for b, ls in repo.branchmap().iteritems():
-@@ -1930,6 +1939,9 @@
+@@ -1952,6 +1961,9 @@
      if not opts.get('closed'):
          heads = [h for h in heads if not h.extra().get('close')]
  
      if opts.get('active') and branchrevs:
          dagheads = repo.heads(start)
          heads = [h for h in heads if h.node() in dagheads]
-@@ -2630,6 +2642,13 @@
+@@ -2653,6 +2665,13 @@
              return
          if opts.get('only_merges') and len(parents) != 2:
              return
          if opts.get('branch') and ctx.branch() not in opts['branch']:
              return
          if df and not df(ctx.date()[0]):
-@@ -2737,6 +2756,7 @@
+@@ -2760,6 +2779,7 @@
      if not node:
          branch = repo[None].branch()
          bheads = repo.branchheads(branch)
          if len(bheads) > 2:
              raise util.Abort(_(
                  'branch \'%s\' has %d heads - '
-@@ -2939,7 +2959,8 @@
+@@ -2962,7 +2982,8 @@
                      "so a rev cannot be specified.")
              raise util.Abort(err)
  
      if checkout:
          checkout = str(repo.changelog.rev(other.lookup(checkout)))
      repo._subtoppath = source
-@@ -3018,7 +3039,8 @@
+@@ -3041,7 +3062,8 @@
      finally:
          del repo._subtoppath
      result = repo.push(other, opts.get('force'), revs=revs,
  
      result = (result == 0)
  
-@@ -4293,7 +4315,9 @@
+@@ -4317,7 +4339,9 @@
           [('a', 'active', False,
             _('show only branches that have unmerged heads')),
            ('c', 'closed', False,
           _('[-ac]')),
      "bundle":
          (bundle,
-@@ -4335,6 +4359,8 @@
+@@ -4359,6 +4383,8 @@
            ('', 'pull', None, _('use pull protocol to copy metadata')),
            ('', 'uncompressed', None,
             _('use uncompressed transfer (fast over LAN)')),
           ] + remoteopts,
           _('[OPTION]... SOURCE [DEST]')),
      "^commit|ci":
-@@ -4343,6 +4369,8 @@
+@@ -4367,6 +4393,8 @@
             _('mark new/missing files as added/removed before committing')),
            ('', 'close-branch', None,
             _('mark a branch as closed, hiding it from the branch list')),
           ] + walkopts + commitopts + commitopts2,
           _('[OPTION]... [FILE]...')),
      "copy|cp":
-@@ -4460,6 +4488,8 @@
+@@ -4484,6 +4512,8 @@
             _('show active branchheads only (DEPRECATED)')),
            ('c', 'closed', False,
             _('show normal and closed branch heads')),
           ] + templateopts,
           _('[-ac] [-r STARTREV] [REV]...')),
      "help": (help_, [], _('[TOPIC]')),
-@@ -4503,6 +4533,7 @@
+@@ -4527,6 +4557,7 @@
            ('B', 'bookmarks', False, _("compare bookmarks")),
            ('b', 'branch', [],
             _('a specific branch you would like to pull'), _('BRANCH')),
           ] + logopts + remoteopts + subrepoopts,
           _('[-p] [-n] [-M] [-f] [-r REV]...'
             ' [--bundle FILENAME] [SOURCE]')),
-@@ -4535,6 +4566,7 @@
+@@ -4559,6 +4590,7 @@
            ('r', 'rev', [],
             _('show the specified revision or range'), _('REV')),
            ('', 'removed', None, _('include revisions where files were removed')),
            ('m', 'only-merges', None, _('show only merges')),
            ('u', 'user', [],
             _('revisions committed by user'), _('USER')),
-@@ -4572,6 +4604,7 @@
+@@ -4596,6 +4628,7 @@
            ('B', 'bookmarks', False, _("compare bookmarks")),
            ('b', 'branch', [],
             _('a specific branch you would like to push'), _('BRANCH')),
           ] + logopts + remoteopts + subrepoopts,
           _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
      "parents":
-@@ -4592,6 +4625,7 @@
+@@ -4616,6 +4649,7 @@
            ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
            ('b', 'branch', [],
             _('a specific branch you would like to pull'), _('BRANCH')),
           ] + remoteopts,
           _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
      "^push":
-@@ -4604,6 +4638,7 @@
+@@ -4628,6 +4662,7 @@
            ('b', 'branch', [],
             _('a specific branch you would like to push'), _('BRANCH')),
            ('', 'new-branch', False, _('allow pushing a new branch')),
              else:
                  raise util.Abort(_("clone from remote to remote not supported"))
  
-@@ -422,7 +422,8 @@
+@@ -437,7 +437,8 @@
      if revs:
          revs = [other.lookup(rev) for rev in revs]
      other, incoming, bundle = bundlerepo.getremotechanges(ui, repo, other, revs,
      if incoming is None:
          ui.status(_("no changes found\n"))
          return subreporecurse()
-@@ -478,7 +479,8 @@
+@@ -493,7 +494,8 @@
  
      other = repository(remoteui(repo, opts), dest)
      ui.status(_('comparing with %s\n') % url.hidepassword(dest))
  def descendants(repo, subset, x):
      """``descendants(set)``
      Changesets which are descendants of changesets in set.
-@@ -695,6 +717,7 @@
+@@ -710,6 +732,7 @@
      "closed": closed,
      "contains": contains,
      "date": date,
    serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, templates, style, ipv6, certificate
    status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
 @@ -202,7 +202,7 @@
-   bisect: reset, good, bad, skip, command, noupdate
+   bisect: reset, good, bad, skip, extend, command, noupdate
    bookmarks: force, rev, delete, rename
    branch: force, clean
 -  branches: active, closed
 diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
 --- a/tests/test-hgweb-commands.t
 +++ b/tests/test-hgweb-commands.t
-@@ -901,7 +901,7 @@
+@@ -905,7 +905,7 @@
    $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=capabilities'; echo
    200 Script output follows
    
 diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t
 --- a/tests/test-http-proxy.t
 +++ b/tests/test-http-proxy.t
-@@ -102,23 +102,23 @@
+@@ -101,19 +101,19 @@
    * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadheads&dead=True HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadchangegroup&dead=True&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys&namespace=bookmarks HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadheads&dead=True HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadchangegroup&dead=True&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys&namespace=bookmarks HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadheads&dead=True HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadchangegroup&dead=True&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys&namespace=bookmarks HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
+   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob)
 -  * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadheads&dead=True HTTP/1.1" - - (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=deadchangegroup&dead=True&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys&namespace=bookmarks HTTP/1.1" - - (glob)
 +++ b/tests/test-schemes.t
 @@ -27,7 +27,10 @@
    using http://localhost:$HGPORT/
-   sending between command
+   sending capabilities command
    comparing with parts://localhost
 -  sending heads command
 +  sending capabilities command