absorb: move to hgext

Summary: Move absorb to hgext.

Test Plan: `run-tests.py -l` with empty `PYTHONPATH`.

Reviewers: durham, #mercurial

Reviewed By: durham

Differential Revision: https://phabricator.intern.facebook.com/D6678562

Signature: 6678562:1515455701:8778bc0ce54ec017483f6826a9792bebcb9464d7

hgext/absorb/__init__.py

@@ -28,8 +28,9 @@ amend modified chunks into the corresponding non-public changesets.
 from __future__ import absolute_import
 
 import collections
-import linelog
 
+from mercurial.i18n import _
+from mercurial.cyext import linelog
 from mercurial import (
     cmdutil,
     commands,
@@ -47,7 +48,6 @@ from mercurial import (
     scmutil,
     util,
 )
-from mercurial.i18n import _
 
 testedwith = 'ships-with-fb-hgext'
 

setup.py

@@ -852,7 +852,10 @@ packages = ['mercurial',
             'mercurial.pure',
             'mercurial.thirdparty',
             'mercurial.thirdparty.attr',
-            'hgext', 'hgext.convert', 'hgext.extlib', 'hgext.fsmonitor',
+            'hgext',
+            'hgext.absorb',
+            'hgext.convert',
+            'hgext.fsmonitor',
             'hgext.fsmonitor.pywatchman', 'hgext.highlight',
             'hgext.largefiles', 'hgext.lfs', 'hgext.zeroconf', 'hgext3rd',
             'hgdemandimport']

tests/test-check-module-imports.t

@@ -57,7 +57,6 @@ outputs, which should be fixed later.
   fb-hgext/distutils_rust/__init__.py:9: direct symbol import log from distutils
   fb-hgext/distutils_rust/__init__.py:10: relative import of stdlib module
   fb-hgext/distutils_rust/__init__.py:10: direct symbol import build from distutils.command.build
-  fb-hgext/hgext3rd/absorb/__init__.py:50: symbol import follows non-symbol import: mercurial.i18n
   fb-hgext/hgext3rd/age.py:21: imports not lexically sorted: re < time
   fb-hgext/hgext3rd/cleanobsstore.py:37: symbol import follows non-symbol import: mercurial.i18n
   fb-hgext/hgext3rd/conflictinfo.py:30: direct symbol import absentfilectx from mercurial.filemerge

tests/test-check-py3-compat.t

@@ -119,7 +119,6 @@
   fb-hgext/tests/ls-l.py requires print_function
   fb-hgext/tests/perftest.py not using absolute_import
   fb-hgext/tests/perftest.py requires print_function
-  fb-hgext/tests/test-fb-hgext-absorb-filefixupstate.py not using absolute_import
   fb-hgext/tests/test-fb-hgext-extutil.py not using absolute_import
   fb-hgext/tests/test-fb-hgext-fastmanifest.py not using absolute_import
   fb-hgext/tests/test-fb-hgext-generic-bisect.py not using absolute_import

tests/test-fb-hgext-absorb-edit-lines.t

@@ -3,7 +3,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > absorb=$TESTDIR/../hgext3rd/absorb
+  > absorb=
   > EOF
 
   $ hg init repo1

tests/test-fb-hgext-absorb-filefixupstate.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import itertools
 import os
 import sys
@@ -5,7 +7,7 @@ import sys
 # make it runnable directly without run-tests.py
 sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
 
-from hgext3rd import absorb
+from hgext import absorb
 
 class simplefctx(object):
     def __init__(self, content):

tests/test-fb-hgext-absorb-phase.t

@@ -1,6 +1,6 @@
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > absorb=$TESTDIR/../hgext3rd/absorb
+  > absorb=
   > drawdag=$RUNTESTDIR/drawdag.py
   > EOF
 

tests/test-fb-hgext-absorb-rename.t

@@ -5,7 +5,7 @@
   > [diff]
   > git=1
   > [extensions]
-  > absorb=$TESTDIR/../hgext3rd/absorb
+  > absorb=
   > EOF
 
   $ sedi() { # workaround check-code

tests/test-fb-hgext-absorb-strip.t

@@ -2,7 +2,7 @@ Do not strip innocent children. See https://bitbucket.org/facebook/hg-experiment
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > absorb=$TESTDIR/../hgext3rd/absorb
+  > absorb=
   > drawdag=$RUNTESTDIR/drawdag.py
   > EOF
 

tests/test-fb-hgext-absorb.t

@@ -3,7 +3,7 @@
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > absorb=$TESTDIR/../hgext3rd/absorb
+  > absorb=
   > EOF
 
   $ sedi() { # workaround check-code

tests/test-help.t

@@ -250,6 +250,7 @@ Test extension help:
   
       disabled extensions:
   
+       absorb        apply working directory changes to changesets
        acl           hooks for controlling repository access
        blackbox      log repository events to a blackbox for debugging
        bugzilla      hooks for integrating with the Bugzilla bug tracker