Commits

Martin Geisler  committed 0360554

rebased to cd31a1cc1521

  • Participants
  • Parent commits 059d8fc

Comments (0)

Files changed (8)

File abandon-command

 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306919141 -7200
-# Node ID b12d304312694d1b6d3c4026c87d4dd15525e188
-# Parent  f8db33afb6c0f61f54b6aa06643e48dd76c54163
+# Node ID 2ae3af0a1c7e20c0e6d74963e97fd0cc18c36062
+# Parent  639fd98977aae29341aa6cfe368f14093a689d2c
 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 59db7173bc235b8be2eb9a51c91e4ac9ebfa6f0d
-# Parent  b12d304312694d1b6d3c4026c87d4dd15525e188
+# Node ID 3c34c842ef244457d549229f3b70f22afd728590
+# Parent  2ae3af0a1c7e20c0e6d74963e97fd0cc18c36062
 revset: add abandoned keyword
 
 diff --git a/mercurial/revset.py b/mercurial/revset.py
 # HG changeset patch
-# Parent 9c994320aeadffc9ba6382e63b1f6e7e25337fca
+# User Martin Geisler <mg@aragost.com>
+# Date 1307125549 -7200
+# Node ID b49ca71cf89fbeb2ef2b816c80768e3031b2d515
+# Parent  4ce5dc47d305e9811a662c92a167fccd51363db8
 clone: add --abandoned flag
 
 diff --git a/mercurial/commands.py b/mercurial/commands.py
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -978,6 +978,8 @@
+@@ -967,6 +967,8 @@
      ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
      ('r', 'rev', [], _('include the specified changeset'), _('REV')),
      ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
      ('', 'pull', None, _('use pull protocol to copy metadata')),
      ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
      ] + remoteopts,
-@@ -1054,7 +1056,8 @@
+@@ -1043,7 +1045,8 @@
                   stream=opts.get('uncompressed'),
                   rev=opts.get('rev'),
                   update=opts.get('updaterev') or not opts.get('noupdate'),
 diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
 --- a/mercurial/localrepo.py
 +++ b/mercurial/localrepo.py
-@@ -2010,7 +2010,7 @@
+@@ -2092,7 +2092,7 @@
          finally:
              lock.release()
  
          '''clone remote repository.
  
          keyword arguments:
-@@ -2036,7 +2036,7 @@
+@@ -2118,7 +2118,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-abandoned.t b/tests/test-abandoned.t
 --- a/tests/test-abandoned.t
 +++ b/tests/test-abandoned.t
-@@ -412,11 +412,62 @@
+@@ -406,11 +406,62 @@
    0 54dbcd775ef0 init
    $ hg rollback -q
  
    $ touch y
    $ hg commit -A -m y y
    created new head
-@@ -731,3 +782,56 @@
+@@ -725,3 +776,56 @@
    1 0b00c28422ee x
    0 54dbcd775ef0 init
    $ hg rollback -q
 diff --git a/tests/test-debugcomplete.t b/tests/test-debugcomplete.t
 --- a/tests/test-debugcomplete.t
 +++ b/tests/test-debugcomplete.t
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,7 @@
    $ hg debugcommands
    add: include, exclude, subrepos, dry-run
    annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, include, exclude
 # HG changeset patch
-# Parent a01e1389623ada435e094c75e10b470e9aa16c49
+# User Martin Geisler <mg@aragost.com>
+# Date 1307125550 -7200
+# Node ID f5e5bdeed66d0d563831dc06feca6ccb00b002a4
+# Parent  b49ca71cf89fbeb2ef2b816c80768e3031b2d515
 changelog: exclude abandoned changesets from heads
 
 This effectively cuts off the abandoned changesets from the changelog
 diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
 --- a/mercurial/localrepo.py
 +++ b/mercurial/localrepo.py
-@@ -1460,8 +1460,11 @@
+@@ -1457,8 +1457,11 @@
              l.sort()
          return r
  
 # HG changeset patch
 # User Martin Geisler <mg@aragost.com>
 # Date 1307118242 -7200
-# Node ID f8db33afb6c0f61f54b6aa06643e48dd76c54163
-# Parent  28682c7e7479ab4b247fa4f7c9bdf796c12fd7b5
+# Node ID 639fd98977aae29341aa6cfe368f14093a689d2c
+# Parent  cd31a1cc15217a120cf58a5cd6ebb25c6ca270bf
 changelog: add infrastructure for hiding changesets
 
 diff --git a/mercurial/changelog.py b/mercurial/changelog.py
 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306919172 -7200
-# Node ID 42c450076c85e537049306f87b4d2bdffbd2d926
-# Parent 59db7173bc235b8be2eb9a51c91e4ac9ebfa6f0d
+# Node ID fb90e10456796088fb25c643982cc70481275830
+# Parent 3c34c842ef244457d549229f3b70f22afd728590
 commands: add --abandoned flag to push, pull, outgoing, and incoming
 
 The flag makes the commands include abandoned changesets, the default
      def lookup(self, key):
          if isinstance(key, int):
              return self.changelog.node(key)
-@@ -1432,11 +1522,11 @@
+@@ -1429,11 +1519,11 @@
  
          return r
  
              common, fetch, rheads = tmp
              if not fetch:
                  self.ui.status(_("no changes found\n"))
-@@ -1473,7 +1563,8 @@
+@@ -1470,7 +1560,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
-@@ -1496,7 +1587,7 @@
+@@ -1493,7 +1584,7 @@
              lock = remote.lock()
          try:
              cg, remote_heads = discovery.prepush(self, remote, force, revs,
 +  $ hg push --abandoned ../base-i
 +  pushing to ../base-i
 +  searching for changes
-+  abort: push creates new remote heads on branch 'default'!
++  abort: push creates new remote head 339976ff5010!
 +  (did you forget to merge? use push -f to force)
 +  [255]
 +  $ hg push --abandoned --force ../base-i
 +  $ hg push --abandoned ../base-x
 +  pushing to ../base-x
 +  searching for changes
-+  abort: push creates new remote heads on branch 'default'!
++  abort: push creates new remote head 339976ff5010!
 +  (did you forget to merge? use push -f to force)
 +  [255]
 +  $ hg push --abandoned --force ../base-x

File postincoming

 # HG changeset patch
-# Parent 582777fbdc5174bae2b07ed2eea64066c6849319
+# User Martin Geisler <mg@aragost.com>
+# Date 1307125545 -7200
+# Node ID 4ce5dc47d305e9811a662c92a167fccd51363db8
+# Parent  6dcc20e5e7744a50fa5142f47324b3dd8714c669
 postincoming: output a warning if the working copy is abandoned
 
 diff --git a/mercurial/commands.py b/mercurial/commands.py
 # HG changeset patch
 # User Martin Geisler <mg@lazybytes.net>
 # Date 1306923811 -7200
-# Node ID dc6390ced27044d8711da7995a93f6babdacfba3
-# Parent 73a6f24415b0f3a0f777514a436ef5b52909ca54
+# Node ID 6dcc20e5e7744a50fa5142f47324b3dd8714c669
+# Parent  fb90e10456796088fb25c643982cc70481275830
 wireproto: add nonabandoned wireproto command
 
 Used with httprepo and sshrepo to let the server prune the list of