hgext: update rebase extension output (Bug 1721228) r=zeid
authorConnor Sheehan <sheehan@mozilla.com>
Tue, 24 Aug 2021 16:03:44 +0000
changeset 7714 32e480a89b53b8a67e4d1fb9c9a9fd3d12a08f2f
parent 7713 79637068b49222ef493a649a8057edd882609690
child 7715 4aa3fd28f0a231f53547495274cb47c0d223b46c
push id3863
push usercosheehan@mozilla.com
push dateTue, 24 Aug 2021 16:05:52 +0000
treeherderversion-control-tools@177006efefb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerszeid
bugs1721228
hgext: update rebase extension output (Bug 1721228) r=zeid The `rebase` extension changed how some of it's output is formatted to the screen when a tag is present on a rebased revision. Update the tests to reflect this and mark a few extensions as compatible with Mercurial 5.9 as a result. Depends on D123469 Differential Revision: https://phabricator.services.mozilla.com/D123470
hgext/clang-format/tests/test-clang-format.t
hgext/js-format/tests/test-js-format.t
hgext/obsolescencehacks/__init__.py
hgext/obsolescencehacks/tests/test-exchange-user.t
hgext/pushlog/__init__.py
hgext/pushlog/feed.py
hgext/pushlog/tests/test-pull-obsolete.t
hgserver/tests/test-obsolescence-server.t
pylib/vcsreplicator/tests/test-pulse-obsolete.t
pylib/vcsreplicator/tests/test-pushkey-obsolescence.t
--- a/hgext/clang-format/tests/test-clang-format.t
+++ b/hgext/clang-format/tests/test-clang-format.t
@@ -87,17 +87,18 @@ Rebase (should not run the hook)
   |
   o  changeset:   0:7ee4c4e22a8d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     Add mach
   
   $ hg rebase -s 2 -d 0
   rebasing 2:0088d44a4e42 "second commit"
-  rebasing 3:059cd3ee4b4d "third commit" (tip)
+  rebasing 3:059cd3ee4b4d tip "third commit" (hg59 !)
+  rebasing 3:059cd3ee4b4d "third commit" (tip) (no-hg59 !)
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/0088d44a4e42-bbfa5a85-rebase.hg
   $ hg export -r 1 | grep -v -q "int clang_format=42"
   $ hg export -r 2 | grep -q "int clang_format=42"
   $ hg export -r 3 | grep -q "int clang_format=42"
 
 Update (should not run the hook)
 
   $ hg update -r 2
--- a/hgext/js-format/tests/test-js-format.t
+++ b/hgext/js-format/tests/test-js-format.t
@@ -87,17 +87,18 @@ Rebase (should not run the hook)
   |
   o  changeset:   0:9533808dc03a
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     Add mach
   
   $ hg rebase -s 2 -d 0
   rebasing 2:af87cd2e6ed2 "second commit"
-  rebasing 3:204033503640 "third commit" (tip)
+  rebasing 3:204033503640 tip "third commit" (hg59 !)
+  rebasing 3:204033503640 "third commit" (tip) (no-hg59 !)
   saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/af87cd2e6ed2-4eae2e22-rebase.hg
   $ hg export -r 1 | grep -v -q "let js_format=42"
   $ hg export -r 2 | grep -q "let js_format=42"
   $ hg export -r 3 | grep -q "let js_format=42"
 
 Update (should not run the hook)
 
   $ hg update -r 2
--- a/hgext/obsolescencehacks/__init__.py
+++ b/hgext/obsolescencehacks/__init__.py
@@ -9,17 +9,17 @@ import pwd
 from mercurial import (
     configitems,
     error,
     obsolete,
     pycompat,
     registrar,
 )
 
-testedwith = b'4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5'
+testedwith = b'4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.9'
 minimumhgversion = b'4.4'
 
 
 configtable = {}
 configitem = registrar.configitem(configtable)
 
 configitem(b'obshacks', b'obsolescenceexchangeusers',
            default=configitems.dynamicdefault)
--- a/hgext/obsolescencehacks/tests/test-exchange-user.t
+++ b/hgext/obsolescencehacks/tests/test-exchange-user.t
@@ -57,17 +57,18 @@ Obsolescence should not be enabled by in
 Enabling obsolescence won't enable marker exchange since the user doesn't match
 
   $ export USER=noexchange
   $ cat >> .hg/hgrc << EOF
   > [experimental]
   > evolution.createmarkers = true
   > EOF
   $ hg rebase -s tip -d 0
-  rebasing 2:f63449cbe54b "commit0" (tip)
+  rebasing 2:f63449cbe54b tip "commit0" (hg59 !)
+  rebasing 2:f63449cbe54b "commit0" (tip) (no-hg59 !)
 
   $ hg debugobsolete
   f63449cbe54b827336a7f1ffc693d3bae1ade0a7 e5c676115f5fcffb7934901030505da37e515075 0 (*) {*'user': 'test'} (glob)
 
   $ hg log -G
   o  changeset:   3:e5c676115f5f
   |  tag:         tip
   |  parent:      0:96ee1d7354c4
--- a/hgext/pushlog/__init__.py
+++ b/hgext/pushlog/__init__.py
@@ -38,17 +38,17 @@ OUR_DIR = os.path.normpath(os.path.dirna
 with open(os.path.join(OUR_DIR, '..', 'bootstrap.py')) as f:
     exec(f.read())
 
 
 Abort = error.Abort
 RepoLookupError = error.RepoLookupError
 
 minimumhgversion = b'4.8'
-testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5'
+testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.9'
 buglink = b'https://bugzilla.mozilla.org/enter_bug.cgi?product=Developer%20Services&component=Mercurial%3A%20Pushlog'
 
 cmdtable = {}
 command = registrar.command(cmdtable)
 
 configtable = {}
 configitem = registrar.configitem(configtable)
 
--- a/hgext/pushlog/feed.py
+++ b/hgext/pushlog/feed.py
@@ -24,17 +24,17 @@ from mercurial import (
 
 sys.path.append(os.path.dirname(__file__))
 
 with demandimport.deactivated():
     from parsedatetime import parsedatetime as pdt
 
 xmlescape = templatefilters.xmlescape
 
-testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5'
+testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.9'
 minimumhgversion = b'4.8'
 
 cal = pdt.Calendar()
 PUSHES_PER_PAGE = 10
 
 
 def addwebcommand(f, name):
     '''Adds `f` as a webcommand named `name`.'''
--- a/hgext/pushlog/tests/test-pull-obsolete.t
+++ b/hgext/pushlog/tests/test-pull-obsolete.t
@@ -36,17 +36,19 @@
   $ touch file0
   $ hg -q commit -A -m file0
   $ hg -q push
   $ hg -q up -r 0
   $ touch file1
   $ hg -q commit -A -m file1
   $ hg -q push -f
   $ hg rebase -s . -d 1
-  rebasing 2:80c2c663cb83 "file1" (tip)
+  rebasing 2:80c2c663cb83 "file1" (tip) (no-hg59 !)
+  rebasing 2:80c2c663cb83 tip "file1" (hg59 !)
+
   $ hg push
   pushing to ssh://user@dummy/$TESTTMP/server
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 1 changesets with 0 changes to 1 files
--- a/hgserver/tests/test-obsolescence-server.t
+++ b/hgserver/tests/test-obsolescence-server.t
@@ -196,17 +196,18 @@ Pushing a changeset then hiding it works
   remote: recorded push in pushlog
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 
   remote: View your change here:
   remote:   https://hg.mozilla.org/users/user_example.com/repo-1/rev/6ddbc9389e710d9b4f3c880d7c99320f9581dbd5
   remote: recorded changegroup in replication log in \d+\.\d+s (re)
 
   $ hg rebase -s 6ddbc9389e71 -d 8713015ee6f2
-  rebasing 5:6ddbc9389e71 "head2" (tip)
+  rebasing 5:6ddbc9389e71 tip "head2" (hg59 !)
+  rebasing 5:6ddbc9389e71 "head2" (tip) (no-hg59 !)
   $ hg push -f ssh://$SSH_SERVER:$HGPORT/users/user_example.com/repo-1
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/users/user_example.com/repo-1
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 1 changesets with 0 changes to 1 files
@@ -281,17 +282,18 @@ Create a repo that only has the createma
   $ touch file0
   $ hg -q commit -A -m file0
   $ hg -q push
   $ hg -q up -r 0
   $ touch file1
   $ hg -q commit -A -m file1
   $ hg -q push -f
   $ hg rebase -s . -d 1
-  rebasing 2:5fb779ae39de "file1" (tip)
+  rebasing 2:5fb779ae39de tip "file1" (hg59 !)
+  rebasing 2:5fb779ae39de "file1" (tip) (no-hg59 !)
 
 Pushing should not send obsolescence markers because marker exchange isn't allowed
 and we're not in the allowed user list
 
   $ hg push
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/integration/autoland
   searching for changes
   remote: adding changesets
@@ -319,17 +321,18 @@ processes on both server and mirror)
 
   $ hgmo exec hgssh /set-hgrc-option integration/autoland obshacks obsolescenceexchangeusers "user@example.com,vcs-sync@mozilla.com,hg"
   $ hgmo exec hgssh /var/hg/venv_pash/bin/hg -R /repo/hg/mozilla/integration/autoland replicatehgrc
   recorded hgrc in replication log
 
 Pushing again should send obsolescence markers
 
   $ hg rebase -s . -d 0
-  rebasing 3:d57129f00b2f "file1" (tip)
+  rebasing 3:d57129f00b2f tip "file1" (hg59 !)
+  rebasing 3:d57129f00b2f "file1" (tip) (no-hg59 !)
   $ hg push -f
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/integration/autoland
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 1 changesets with 0 changes to 1 files (+1 heads)
--- a/pylib/vcsreplicator/tests/test-pulse-obsolete.t
+++ b/pylib/vcsreplicator/tests/test-pulse-obsolete.t
@@ -38,17 +38,18 @@ Obsolescence markers are turned into pul
 
 There is a race between multiple repo events and the pulse consumer processing
 them. So disable the pulse consumer until all repo changes have been made.
 
   $ hgmo exec hgssh supervisorctl stop pulsenotifier
   pulsenotifier: stopped
 
   $ hg rebase -s . -d 0
-  rebasing 2:4da703b7f59b "file1" (tip)
+  rebasing 2:4da703b7f59b tip "file1" (hg59 !)
+  rebasing 2:4da703b7f59b "file1" (tip) (no-hg59 !)
   $ hg push -f
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/obs
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 1 changesets with 0 changes to 1 files (+1 heads)
--- a/pylib/vcsreplicator/tests/test-pushkey-obsolescence.t
+++ b/pylib/vcsreplicator/tests/test-pushkey-obsolescence.t
@@ -308,17 +308,18 @@ Pushing obsolescence marker without bund
   vcsreplicator.consumer   > (run 'hg heads' to see heads)
   vcsreplicator.consumer   [0]
   vcsreplicator.consumer mismatch between expected and actual changeset count: expected 1, got 2
   vcsreplicator.consumer pulled 2 changesets into $TESTTMP/repos/obs
   $ consumer --onetime
   vcsreplicator.consumer processing hg-heads-1: (repo: {moz}/obs, heads: ['de9a6dc9203d34261c1e2bea219bdd6053d74dda'], last_push_id: 4) from partition 2 offset 21
 
   $ hg rebase -s . -d 77538e1ce4be
-  rebasing 5:de9a6dc9203d "file3" (tip)
+  rebasing 5:de9a6dc9203d tip "file3" (hg59 !)
+  rebasing 5:de9a6dc9203d "file3" (tip) (no-hg59 !)
   $ hg --config experimental.bundle2-exp=false push -f
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/obs
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 1 changesets with 0 changes to 2 files (+1 heads)
@@ -398,17 +399,18 @@ Now let's check what happens when replic
   $ hg -q commit -A -m file5
   $ hg -q push
   $ touch file6
   $ hg -q commit -A -m file6
   $ hg -q push
 
   $ hg rebase -s 63d556ea5b9f -d 33e52188e177
   rebasing 8:63d556ea5b9f "file5"
-  rebasing 9:87d2d20529e7 "file6" (tip)
+  rebasing 9:87d2d20529e7 tip "file6" (hg59 !)
+  rebasing 9:87d2d20529e7 "file6" (tip) (no-hg59 !)
   $ hg push -f
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/obs
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 2 changesets with 0 changes to 3 files (+1 heads)
@@ -418,17 +420,18 @@ Now let's check what happens when replic
   remote: View your changes here:
   remote:   https://hg.mozilla.org/obs/rev/274cd1d986ab248aae0dfb9a902f7b6c823daec4
   remote:   https://hg.mozilla.org/obs/rev/27eddb78301f686b0894dadaa2deb6dfbb080123
   remote: recorded changegroup in replication log in \d+\.\d+s (re)
   remote: recorded updates to obsolete in replication log in \d+\.\d+s (re)
 
   $ hg rebase -s 274cd1d986ab -d 3694f932529e
   rebasing 10:274cd1d986ab "file5"
-  rebasing 11:27eddb78301f "file6" (tip)
+  rebasing 11:27eddb78301f tip "file6" (hg59 !)
+  rebasing 11:27eddb78301f "file6" (tip) (no-hg59 !)
   $ hg push
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT/obs
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: recorded push in pushlog
   remote: added 2 changesets with 0 changes to 3 files (+1 heads)