Martin Geisler avatar Martin Geisler committed a4c5fda

rebased to a56c1b2bff18

Comments (0)

Files changed (1)

 # HG changeset patch
 # User Henrik Stuart <hg@hstuart.dk>
 # Date 1297282594 -3600
-# Node ID 2cc18cf3f6f3b0ed0b75eda93af6f427483ba039
-# Parent  9cb1a42cd4b3e90d30cf3f921f12b23401cccc68
+# Node ID ea71e2d279a2d31f852fb2aa8b00485c81d0a08d
+# Parent  a56c1b2bff1806aa0ce2495ad56bd2301908b521
 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/hgext/mq.py b/hgext/mq.py
 --- a/hgext/mq.py
 +++ b/hgext/mq.py
-@@ -2935,7 +2935,7 @@
+@@ -2936,7 +2936,7 @@
              return super(mqrepo, self).commit(text, user, date, match, force,
                                                editor, extra)
  
              if self.mq.applied and not force:
                  haspatches = True
                  if revs:
-@@ -2946,7 +2946,7 @@
+@@ -2947,7 +2947,7 @@
                      haspatches = bool([n for n in revs if n in applied])
                  if haspatches:
                      raise util.Abort(_('source has mq patches applied'))
      if opts.get('active') and branchrevs:
          dagheads = repo.heads(start)
          heads = [h for h in heads if h.node() in dagheads]
-@@ -2653,6 +2665,13 @@
+@@ -2667,6 +2679,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]):
-@@ -2760,6 +2779,7 @@
+@@ -2774,6 +2793,7 @@
      if not node:
          branch = repo[None].branch()
          bheads = repo.branchheads(branch)
          if len(bheads) > 2:
              raise util.Abort(_(
                  'branch \'%s\' has %d heads - '
-@@ -2962,7 +2982,8 @@
+@@ -2976,7 +2996,8 @@
                      "so a rev cannot be specified.")
              raise util.Abort(err)
  
 -    modheads = repo.pull(other, heads=revs, force=opts.get('force'))
 +    modheads = repo.pull(other, heads=revs, force=opts.get('force'),
 +            dead=opts.get('dead'))
+     bookmarks.updatefromremote(ui, repo, other)
      if checkout:
          checkout = str(repo.changelog.rev(other.lookup(checkout)))
-     repo._subtoppath = source
-@@ -3041,7 +3062,8 @@
+@@ -3056,7 +3077,8 @@
      finally:
          del repo._subtoppath
      result = repo.push(other, opts.get('force'), revs=revs,
  
      result = (result == 0)
  
-@@ -4317,7 +4339,9 @@
+@@ -4332,7 +4354,9 @@
           [('a', 'active', False,
             _('show only branches that have unmerged heads')),
            ('c', 'closed', False,
           _('[-ac]')),
      "bundle":
          (bundle,
-@@ -4359,6 +4383,8 @@
+@@ -4374,6 +4398,8 @@
            ('', 'pull', None, _('use pull protocol to copy metadata')),
            ('', 'uncompressed', None,
             _('use uncompressed transfer (fast over LAN)')),
           ] + remoteopts,
           _('[OPTION]... SOURCE [DEST]')),
      "^commit|ci":
-@@ -4367,6 +4393,8 @@
+@@ -4382,6 +4408,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":
-@@ -4484,6 +4512,8 @@
+@@ -4499,6 +4527,8 @@
             _('show active branchheads only (DEPRECATED)')),
            ('c', 'closed', False,
             _('show normal and closed branch heads')),
           ] + templateopts,
           _('[-ac] [-r STARTREV] [REV]...')),
      "help": (help_, [], _('[TOPIC]')),
-@@ -4527,6 +4557,7 @@
+@@ -4542,6 +4572,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]')),
-@@ -4559,6 +4590,7 @@
+@@ -4574,6 +4605,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')),
-@@ -4596,6 +4628,7 @@
+@@ -4611,6 +4643,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":
-@@ -4616,6 +4649,7 @@
+@@ -4631,6 +4664,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":
-@@ -4628,6 +4662,7 @@
+@@ -4643,6 +4677,7 @@
            ('b', 'branch', [],
             _('a specific branch you would like to push'), _('BRANCH')),
            ('', 'new-branch', False, _('allow pushing a new branch')),
                  elif not remote.capable('changegroupsubset'):
                      raise util.Abort(_("partial pull cannot be done because "
                                             "other repository doesn't support "
-@@ -1369,14 +1392,14 @@
+@@ -1348,14 +1371,14 @@
  
          return result
  
          '''Push outgoing changesets (limited by revs) from the current
          repository to remote. Return an integer:
            - 0 means HTTP error *or* nothing to push
-@@ -1392,14 +1415,14 @@
+@@ -1371,14 +1394,14 @@
          # unbundle assumes local user cannot lock remote repo (new ssh
          # servers, http servers).
  
              ret = remote_heads
              if cg is not None:
                  if unbundle:
-@@ -1411,11 +1434,11 @@
+@@ -1390,11 +1413,11 @@
                          remote_heads = ['force']
                      # ssh: return remote's addchangegroup()
                      # http: return remote's addchangegroup() or 0 for error
          finally:
              if lock is not None:
                  lock.release()
-@@ -1481,7 +1504,7 @@
+@@ -1460,7 +1483,7 @@
          if extranodes is None:
              # can we go through the fast path ?
              heads.sort()
              allheads.sort()
              if heads == allheads:
                  return self._changegroup(msng_cl_lst, source)
-@@ -1669,9 +1692,9 @@
+@@ -1648,9 +1671,9 @@
  
          return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
  
  
      def _changegroup(self, nodes, source):
          """Compute the changegroup of all nodes that we have that a recipient
-@@ -1757,7 +1780,8 @@
+@@ -1736,7 +1759,8 @@
  
          return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
  
          """Add the changegroup returned by source.read() to this repo.
          srctype is a string like 'push', 'pull', or 'unbundle'.  url is
          the URL of the repo where this changegroup is coming from.
-@@ -1985,7 +2009,7 @@
+@@ -1964,7 +1988,7 @@
          finally:
              lock.release()
  
          '''clone remote repository.
  
          keyword arguments:
-@@ -2000,7 +2024,7 @@
+@@ -1979,7 +2003,7 @@
          # and format flags on "stream" capability, and use
          # uncompressed only if compatible.
  
              # 'stream' means remote revlog format is revlogv1 only
              if remote.capable('stream'):
                  return self.stream_in(remote, set(('revlogv1',)))
-@@ -2011,7 +2035,7 @@
+@@ -1990,7 +2014,7 @@
                  # if we support it, stream in and adjust our requirements
                  if not streamreqs - self.supportedformats:
                      return self.stream_in(remote, streamreqs)
 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
-@@ -101,19 +101,19 @@
-   * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
+@@ -102,19 +102,19 @@
    * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
+   * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys&namespace=bookmarks 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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.