Rename "bury" back to "sink".

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/Documentation/stg-bury.txt b/Documentation/stg-sink.txt
similarity index 56%
rename from Documentation/stg-bury.txt
rename to Documentation/stg-sink.txt
index 22ab5480b94987fc4f8ac16a92298f6e22a12a3f..0f569be4399b8027a4471bf8914006dc6baf8693 100644 (file)
--- a/Documentation/stg-bury.txt
+++ b/Documentation/stg-sink.txt
@@ -1,16 +1,16 @@
-stg-bury(1)
+stg-sink(1)

 ===========
 Yann Dirson <ydirson@altern.org>
 v0.13, April 2007
 
 NAME
 ----
 ===========
 Yann Dirson <ydirson@altern.org>
 v0.13, April 2007
 
 NAME
 ----

-stg-bury - stgdesc:bury[]
+stg-sink - stgdesc:sink[]

 
 SYNOPSIS
 --------
 [verse]
 
 SYNOPSIS
 --------
 [verse]

-'stg' bury [--to=<target>] [--nopush] [<patches>]
+'stg' sink [--to=<target>] [--nopush] [<patches>]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -21,12 +21,12 @@ patches near the bottom of the stack, where they are less likely to be
 impacted by the push of another patch, and from where they can be more
 easily committed or pushed.
 
 impacted by the push of another patch, and from where they can be more
 easily committed or pushed.
 

-If no patch is specified on command-line, the current patch is buried.
-By default patches are buried at the bottom of the stack, but the
-'--to' option allows to bury under any applied patch.
+If no patch is specified on command-line, the current patch gets sunk.
+By default patches are sunk to the bottom of the stack, but the
+'--to' option allows to place them under any applied patch.

 
 

-Buring internally involves popping all patches (or all patches
-including <target patch>), then pushing the patches to bury, and then
+Sinking internally involves popping all patches (or all patches
+including <target patch>), then pushing the patches to sink, and then

 (unless '--nopush' is also given) pushing back into place the
 formerly-applied patches.
 
 (unless '--nopush' is also given) pushing back into place the
 formerly-applied patches.
 


@@ -36,13 +36,13 @@ OPTIONS
 
 --to=<TARGET>::
 -t <TARGET>::
 
 --to=<TARGET>::
 -t <TARGET>::

-       Specify a target patch to bury the patches below, instead of
-       buring at the bottom of the stack.
+       Specify a target patch to place the patches below, instead of
+       sinking them to the bottom of the stack.

 
 --nopush::
 -n::
        Do not push back on the stack the formerly-applied patches.
 
 --nopush::
 -n::
        Do not push back on the stack the formerly-applied patches.

-       Only the patches to bury are pushed.
+       Only the patches to sink are pushed.

 
 StGIT
 -----
 
 StGIT
 -----

diff --git a/Documentation/stg.txt b/Documentation/stg.txt
index 14371f27203d9fd42bb47900516cfb44ca9bc024..4f9d18e7ca680a15569d146a37d1275e11896daf 100644 (file)
--- a/Documentation/stg.txt
+++ b/Documentation/stg.txt
@@ -162,8 +162,8 @@ stglink:goto[]::
        stgdesc:goto[]
 stglink:float[]::
        stgdesc:float[]
        stgdesc:goto[]
 stglink:float[]::
        stgdesc:float[]

-stglink:bury[]::
-       stgdesc:bury[]
+stglink:sink[]::
+       stgdesc:sink[]

 stglink:applied[]::
        stgdesc:applied[]
 stglink:unapplied[]::
 stglink:applied[]::
        stgdesc:applied[]
 stglink:unapplied[]::

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index 7e45c7e77124365945fbcf160b464f4f83a28427..d4970989435805c42a7e557f6b8c8378092a70ea 100644 (file)
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -15,7 +15,6 @@ _stg_commands="
     applied
     assimilate
     branch
     applied
     assimilate
     branch

-    bury

     delete
     diff
     clean
     delete
     diff
     clean


@@ -46,6 +45,7 @@ _stg_commands="
     rm
     series
     show
     rm
     series
     show

+    sink

     status
     sync
     top
     status
     sync
     top


@@ -201,13 +201,13 @@ _stg ()
         # repository commands
         id)     _stg_patches $command _all_patches ;;
         # stack commands
         # repository commands
         id)     _stg_patches $command _all_patches ;;
         # stack commands

-        bury)   _stg_patches $command _all_patches ;;

         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
         hide)   _stg_patches $command _all_patches ;;
         pop)    _stg_patches $command _applied_patches ;;
         push)   _stg_patches $command _unapplied_patches ;;
         series) _stg_patches $command _all_patches ;;
         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
         hide)   _stg_patches $command _all_patches ;;
         pop)    _stg_patches $command _applied_patches ;;
         push)   _stg_patches $command _unapplied_patches ;;
         series) _stg_patches $command _all_patches ;;

+        sink)   _stg_patches $command _all_patches ;;

         unhide) _stg_patches $command _all_patches ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;
         unhide) _stg_patches $command _all_patches ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;

diff --git a/stgit/commands/bury.py b/stgit/commands/sink.py
similarity index 93%
rename from stgit/commands/bury.py
rename to stgit/commands/sink.py
index b14f09eb12a610174b05f287e46ff884996533de..85cc70f58a2de577436721578c047dd31d99b862 100644 (file)
--- a/stgit/commands/bury.py
+++ b/stgit/commands/sink.py
@@ -24,7 +24,7 @@ from stgit.utils import *
 from stgit import stack, git
 
 
 from stgit import stack, git
 
 

-help = 'bury patches down the stack'
+help = 'send patches deeper down the stack'

 usage = """%prog [-t <target patch>] [-n] [<patches>]
 
 Pop all patches (or all patches including <target patch>), then
 usage = """%prog [-t <target patch>] [-n] [<patches>]
 
 Pop all patches (or all patches including <target patch>), then


@@ -36,10 +36,10 @@ options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after sinking',
                        action = 'store_true'),
            make_option('-t', '--to', metavar = 'TARGET',
                        help = 'do not push the patches back after sinking',
                        action = 'store_true'),
            make_option('-t', '--to', metavar = 'TARGET',

-                       help = 'bury patches below TARGET patch')]
+                       help = 'sink patches below TARGET patch')]

 
 def func(parser, options, args):
 
 def func(parser, options, args):

-    """Bury patches
+    """Sink patches down the stack.

     """
 
     check_local_changes()
     """
 
     check_local_changes()

diff --git a/stgit/main.py b/stgit/main.py
index 9c319c642e04d83b4bed68223416f24b7b4b35de..1a1f534e310e4423feca92a47bbb1d0c68537d16 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -63,7 +63,6 @@ commands = Commands({
     'applied':          'applied',
     'assimilate':       'assimilate',
     'branch':           'branch',
     'applied':          'applied',
     'assimilate':       'assimilate',
     'branch':           'branch',

-    'bury':             'bury',

     'delete':           'delete',
     'diff':             'diff',
     'clean':            'clean',
     'delete':           'delete',
     'diff':             'diff',
     'clean':            'clean',


@@ -94,6 +93,7 @@ commands = Commands({
     'rm':               'rm',
     'series':           'series',
     'show':             'show',
     'rm':               'rm',
     'series':           'series',
     'show':             'show',

+    'sink':             'sink',

     'status':           'status',
     'sync':             'sync',
     'top':              'top',
     'status':           'status',
     'sync':             'sync',
     'top':              'top',


@@ -111,7 +111,6 @@ stackcommands = (
     'applied',
     'assimilate',
     'branch',
     'applied',
     'assimilate',
     'branch',

-    'bury',

     'clean',
     'commit',
     'float',
     'clean',
     'commit',
     'float',


@@ -124,6 +123,7 @@ stackcommands = (
     'push',
     'rebase',
     'series',
     'push',
     'rebase',
     'series',

+    'sink',

     'top',
     'unapplied',
     'uncommit',
     'top',
     'unapplied',
     'uncommit',