Commits

Martin Geisler  committed ff104c9

rebased to 33f620027b58

  • Participants
  • Parent commits 67a4b27

Comments (0)

Files changed (6)

File abandon-command

 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306919141 -7200
-# Node ID 2ae3af0a1c7e20c0e6d74963e97fd0cc18c36062
-# Parent  639fd98977aae29341aa6cfe368f14093a689d2c
+# Node ID 1a9091286e176872c56ac038fa381044824fa84e
+# Parent  548803925b1fcb2a63562439867f67b5a274caca
 commands: add abandon command
 
 Abandoned changesets are hidden from 'hg log' by default.

File abandoned-revset

 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306919165 -7200
-# Node ID 3c34c842ef244457d549229f3b70f22afd728590
-# Parent  2ae3af0a1c7e20c0e6d74963e97fd0cc18c36062
+# Node ID 10c06826def1780b3679608ce85b087917506f50
+# Parent  1a9091286e176872c56ac038fa381044824fa84e
 revset: add abandoned keyword
 
 diff --git a/mercurial/revset.py b/mercurial/revset.py
 # HG changeset patch
 # User Martin Geisler <mg@aragost.com>
 # Date 1307118242 -7200
-# Node ID 639fd98977aae29341aa6cfe368f14093a689d2c
-# Parent  cd31a1cc15217a120cf58a5cd6ebb25c6ca270bf
+# Node ID 548803925b1fcb2a63562439867f67b5a274caca
+# Parent  782b00a922bf44ffcf61f8e0106b7cd3629de390
 changelog: add infrastructure for hiding changesets
 
 diff --git a/mercurial/changelog.py b/mercurial/changelog.py
 diff --git a/mercurial/commands.py b/mercurial/commands.py
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -3288,6 +3288,7 @@
+@@ -3339,6 +3339,7 @@
       _('show changesets within the given named branch'), _('BRANCH')),
      ('P', 'prune', [],
       _('do not display revision or any of its ancestors'), _('REV')),
      ] + logopts + walkopts,
      _('[OPTION]... [FILE]'))
  def log(ui, repo, *pats, **opts):
-@@ -3349,6 +3350,8 @@
+@@ -3400,6 +3401,8 @@
              return
          if opts.get('branch') and ctx.branch() not in opts['branch']:
              return
 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306919172 -7200
-# Node ID fb90e10456796088fb25c643982cc70481275830
-# Parent 3c34c842ef244457d549229f3b70f22afd728590
+# Node ID 25a3296531116515fcee198e775c1c8d2585bc86
+# Parent  10c06826def1780b3679608ce85b087917506f50
 commands: add --abandoned flag to push, pull, outgoing, and incoming
 
 The flag makes the commands include abandoned changesets, the default
 diff --git a/mercurial/commands.py b/mercurial/commands.py
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -3178,6 +3178,7 @@
+@@ -3229,6 +3229,7 @@
  @command('incoming|in',
      [('f', 'force', None,
       _('run even if remote repository is unrelated')),
      ('n', 'newest-first', None, _('show newest record first')),
      ('', 'bundle', '',
       _('file to store the bundles into'), _('FILE')),
-@@ -3549,6 +3550,7 @@
+@@ -3600,6 +3601,7 @@
  
  @command('outgoing|out',
      [('f', 'force', None, _('run even when the destination is unrelated')),
      ('r', 'rev', [],
       _('a changeset intended to be included in the destination'), _('REV')),
      ('n', 'newest-first', None, _('show newest record first')),
-@@ -3697,6 +3699,7 @@
+@@ -3748,6 +3750,7 @@
      [('u', 'update', None,
       _('update to new branch head if changesets were pulled')),
      ('f', 'force', None, _('run even when remote repository is unrelated')),
      ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
      ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
      ('b', 'branch', [], _('a specific branch you would like to pull'),
-@@ -3728,6 +3731,11 @@
+@@ -3779,6 +3782,11 @@
      ui.status(_('pulling from %s\n') % util.hidepassword(source))
      revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
  
      if opts.get('bookmark'):
          if not revs:
              revs = []
-@@ -3745,10 +3753,22 @@
+@@ -3796,10 +3804,22 @@
                      "so a rev cannot be specified.")
              raise util.Abort(err)
  
 +
      repo._subtoppath = source
      try:
-         ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
-@@ -3768,6 +3788,7 @@
+         ret = postincoming(ui, repo, modheads, opts.get('update'))
+@@ -3819,6 +3839,7 @@
  
  @command('^push',
      [('f', 'force', None, _('force push')),
      ('r', 'rev', [],
       _('a changeset intended to be included in the destination'),
       _('REV')),
-@@ -3836,7 +3857,8 @@
+@@ -3887,7 +3908,8 @@
      finally:
          del repo._subtoppath
      result = repo.push(other, opts.get('force'), revs=revs,
 diff --git a/mercurial/hg.py b/mercurial/hg.py
 --- a/mercurial/hg.py
 +++ b/mercurial/hg.py
-@@ -430,7 +430,8 @@
+@@ -436,7 +436,8 @@
      if revs:
          revs = [other.lookup(rev) for rev in revs]
      other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other,
      try:
          if not chlist:
              ui.status(_("no changes found\n"))
-@@ -483,7 +484,8 @@
+@@ -489,7 +490,8 @@
  
-     other = repository(remoteui(repo, opts), dest)
+     other = peer(repo, opts, dest)
      common, outheads = discovery.findcommonoutgoing(repo, other, revs,
 -                                                    force=opts.get('force'))
 +                                                    force=opts.get('force'),
      def lookup(self, key):
          if isinstance(key, int):
              return self.changelog.node(key)
-@@ -1429,11 +1519,11 @@
+@@ -1439,11 +1529,11 @@
  
          return r
  
              common, fetch, rheads = tmp
              if not fetch:
                  self.ui.status(_("no changes found\n"))
-@@ -1470,7 +1560,8 @@
+@@ -1480,7 +1570,8 @@
          """
          pass
  
          '''Push outgoing changesets (limited by revs) from the current
          repository to remote. Return an integer:
            - 0 means HTTP error *or* nothing to push
-@@ -1493,7 +1584,7 @@
+@@ -1503,7 +1594,7 @@
              lock = remote.lock()
          try:
              cg, remote_heads = discovery.prepush(self, remote, force, revs,
 @@ -249,10 +249,10 @@
    help: extension, command
    identify: rev, num, id, branch, tags, bookmarks
-   import: strip, base, force, no-commit, exact, import-branch, message, logfile, date, user, similarity
+   import: strip, base, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity
 -  incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
 +  incoming: force, abandoned, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
    locate: rev, print0, fullpath, include, exclude
 # HG changeset patch
-# Parent cd31a1cc15217a120cf58a5cd6ebb25c6ca270bf
+# User Martin Geisler <mg@aragost.com>
+# Date 1308126276 -7200
+# Node ID 782b00a922bf44ffcf61f8e0106b7cd3629de390
+# Parent  33f620027b58c3c5fe9d0fbd9f759652519b427b
 RFC... postincoming: run 'hg update' with no checkout argument
 
 The current behavior was added to make 'hg pull -r X -r Y -u'
 diff --git a/mercurial/commands.py b/mercurial/commands.py
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -3658,12 +3658,12 @@
+@@ -3709,12 +3709,12 @@
              else:
                  ui.write("%s = %s\n" % (name, util.hidepassword(path)))
  
          except util.Abort, inst:
              ui.warn(_("not updating: %s\n" % str(inst)))
              return 0
-@@ -3736,7 +3736,7 @@
+@@ -3787,7 +3787,7 @@
          checkout = str(repo.changelog.rev(other.lookup(checkout)))
      repo._subtoppath = source
      try:
  
      finally:
          del repo._subtoppath
-@@ -4970,7 +4970,7 @@
+@@ -5004,7 +5004,7 @@
          bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
      finally:
          lock.release()
 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306923811 -7200
-# Node ID 6dcc20e5e7744a50fa5142f47324b3dd8714c669
-# Parent  fb90e10456796088fb25c643982cc70481275830
+# Node ID a9d5a6e8f2591047829db457f638c36554b5fa1a
+# Parent  25a3296531116515fcee198e775c1c8d2585bc86
 wireproto: add nonabandoned wireproto command
 
 Used with httprepo and sshrepo to let the server prune the list of
 diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
 --- a/mercurial/wireproto.py
 +++ b/mercurial/wireproto.py
-@@ -159,6 +159,17 @@
+@@ -311,6 +311,17 @@
              self.ui.status(_('remote: '), l)
          return ret
  
      def debugwireargs(self, one, two, three=None, four=None, five=None):
          # don't pass optional arguments left at their default value
          opts = {}
-@@ -223,7 +234,7 @@
+@@ -403,7 +414,7 @@
  
  def capabilities(repo, proto):
      caps = ('lookup changegroupsubset branchmap pushkey known getbundle '
--            'unbundlehash').split()
-+            'unbundlehash nonabandoned').split()
+-            'unbundlehash batch').split()
++            'unbundlehash batch nonabandoned').split()
      if _allowstream(repo.ui):
          requiredformats = repo.requirements & repo.supportedformats
          # if our local revlogs are just revlogv1, add 'stream' cap
-@@ -291,6 +302,11 @@
+@@ -471,6 +482,11 @@
  def known(repo, proto, nodes, others):
      return ''.join(b and "1" or "0" for b in repo.known(decodelist(nodes)))
  
  def pushkey(repo, proto, namespace, key, old, new):
      # compatibility with pre-1.8 clients which were accidentally
      # sending raw binary nodes rather than utf-8-encoded hex
-@@ -415,6 +431,7 @@
+@@ -596,6 +612,7 @@
      'known': (known, 'nodes *'),
      'listkeys': (listkeys, 'namespace'),
      'lookup': (lookup, 'key'),
 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
-@@ -952,7 +952,7 @@
+@@ -981,7 +981,7 @@
    $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=capabilities'; echo
    200 Script output follows
    
--  lookup changegroupsubset branchmap pushkey known getbundle unbundlehash unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
-+  lookup changegroupsubset branchmap pushkey known getbundle unbundlehash nonabandoned unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
+-  lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
++  lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch nonabandoned unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
  
  heads
  
 @@ -103,18 +103,22 @@
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (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=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=nonabandoned HTTP/1.1" - - x-hgarg-1:candidates=83180e7845de420a1bb46896fd5fe05294f8d629&clientheads=0000000000000000000000000000000000000000 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (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=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=nonabandoned HTTP/1.1" - - x-hgarg-1:candidates=83180e7845de420a1bb46896fd5fe05294f8d629&clientheads=0000000000000000000000000000000000000000 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (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=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=nonabandoned HTTP/1.1" - - x-hgarg-1:candidates=83180e7845de420a1bb46896fd5fe05294f8d629&clientheads=0000000000000000000000000000000000000000 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (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=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
 +  * - - [*] "GET http://localhost:$HGPORT/?cmd=nonabandoned HTTP/1.1" - - x-hgarg-1:candidates=83180e7845de420a1bb46896fd5fe05294f8d629&clientheads=0000000000000000000000000000000000000000 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
    * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob)
 --- a/tests/test-schemes.t
 +++ b/tests/test-schemes.t
 @@ -31,6 +31,7 @@
-   sending heads command
+   sending batch command
    searching for changes
    all remote heads known locally
 +  sending nonabandoned command