Patchwork D11998: simplemerge: delete unused exception class `CantReprocessAndShowBase`

login
register
mail settings
Submitter phabricator
Date Jan. 14, 2022, 5:48 p.m.
Message ID <differential-rev-PHID-DREV-j45y643jhofaopygzmmu-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50324/
State New
Headers show

Comments

phabricator - Jan. 14, 2022, 5:48 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The only user was removed in f18830651811 <https://phab.mercurial-scm.org/rHGf1883065181115355251cc33ba200f72dd3cdae6> (simplemerge: burn "minimal"
  feature to the ground, 2014-08-05).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11998

AFFECTED FILES
  mercurial/simplemerge.py
  tests/test-simplemerge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -48,9 +48,6 @@ 
         )
 
 
-CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
-
-
 def split_lines(t):
     return util.stringio(t).readlines()
 
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -27,10 +27,6 @@ 
 from .utils import stringutil
 
 
-class CantReprocessAndShowBase(Exception):
-    pass
-
-
 def intersect(ra, rb):
     """Given two ranges return the range where they intersect or None.