Patchwork [4,of,4,evolve-ext] config: remove final use of obsolete._enabled

login
register
mail settings
Submitter Durham Goode
Date March 20, 2015, 12:46 a.m.
Message ID <cd7074949c86348df35f.1426812419@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/8187/
State Accepted
Headers show

Comments

Durham Goode - March 20, 2015, 12:46 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1426644306 25200
#      Tue Mar 17 19:05:06 2015 -0700
# Node ID cd7074949c86348df35ffbd554a54809ce2dc689
# Parent  a7288e85066cbc608b12ac6015ea9de4a3b51fec
config: remove final use of obsolete._enabled

Now that nothing in core or in evolve uses _enabled, we can delete the setting
entirely.

A side benefit of removing this flag is that now when doing a push/pull locally,
obsolesence isn't enabled for the peer repo if the main repo had obsolesence but
the peer repo did not. Hence the test change.

Patch

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -36,8 +36,6 @@  from mercurial import util
 
 try:
     from mercurial import obsolete
-    if not obsolete._enabled:
-        obsolete._enabled = True
     from mercurial import wireproto
     gboptslist = getattr(wireproto, 'gboptslist', None)
     gboptsmap = getattr(wireproto, 'gboptsmap', None)
diff --git a/tests/test-evolve-bumped.t b/tests/test-evolve-bumped.t
--- a/tests/test-evolve-bumped.t
+++ b/tests/test-evolve-bumped.t
@@ -71,7 +71,6 @@ 
   pulling from ../public
   searching for changes
   no changes found
-  pull obsolescence markers
   1 new bumped changesets
 
   $ hg evolve -a