##// END OF EJS Templates
rebase: introduce support for automatically rebasing orphan changes...
rebase: introduce support for automatically rebasing orphan changes _destautorebase(SRC) is based on the _destrestack(SRC) revset from fbamend. The supporting _possibledestination function is extracted from evolve, with minor cleanups. We've considered some alternatives here: * This change, but with --auto as the flag name. We're hedging our bets on this a little in this change so that if this ends up being the wrong direction we haven't burned the valauble --auto name on rebase. * --destination auto: I've got reservations about the discoverability of this, and we don't currently have a good story for a revset alias of sorts that changes behavior depending on the context in which it's used. * A "rebase presets" feature, where we could use the currently-an-error positional argument space for the rebase command to define presets, so that users could define a 'linearize' preset that specifies --revision='orphan()-obsolete()' and --dest=_destautoorphanrebase(SRC). Personally, I find the third option somewhat appealing, but am hesitant to "spend" the functionality space of positional arguments to the rebase command. We should revisit the way we expose this functionality sometime in the 4.7 cycle once we've had a chance to vet the implementation of the functionality. Differential Revision: https://phab.mercurial-scm.org/D2668

File last commit:

r36589:5a3f8da6 default
r37805:92213f67 default
Show More
purge.py
129 lines | 4.6 KiB | text/x-python | PythonLexer
Emanuele Aina
Move back the purge extension in hgext
r4311 # Copyright (C) 2006 - Marco Barisione <marco@barisione.org>
#
Matt Mackall
urls: bulk-change primary website URLs
r26421 # This is a small extension for Mercurial (https://mercurial-scm.org/)
Emanuele Aina
Move back the purge extension in hgext
r4311 # that removes files not known to mercurial
#
Martin Geisler
purge: wrap docstrings at 70 characters
r9270 # This program was inspired by the "cvspurge" script contained in CVS
# utilities (http://www.red-bean.com/cvsutils/).
Emanuele Aina
Move back the purge extension in hgext
r4311 #
# For help on the usage of "hg purge" use:
# hg help purge
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
Martin Geisler
Remove FSF mailing address from GPL headers...
r15782 # along with this program; if not, see <http://www.gnu.org/licenses/>.
Emanuele Aina
Move back the purge extension in hgext
r4311
Dirkjan Ochtman
extensions: change descriptions for extensions providing a few commands
r8934 '''command to delete untracked files from the working directory'''
timeless
purge: use absolute_import
r28382 from __future__ import absolute_import
Dirkjan Ochtman
help: add/fix docstrings for a bunch of extensions
r8873
timeless
purge: use absolute_import
r28382 import os
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 from mercurial.i18n import _
timeless
purge: use absolute_import
r28382 from mercurial import (
Yuya Nishihara
commands: move templates of common command options to cmdutil (API)...
r32375 cmdutil,
timeless
purge: use absolute_import
r28382 error,
Augie Fackler
purge: apply byteskwargs to opts, fixing all python3 issues here...
r36589 pycompat,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
timeless
purge: use absolute_import
r28382 scmutil,
util,
)
Emanuele Aina
Move back the purge extension in hgext
r4311
Adrian Buehlmann
purge: use cmdutil.command decorator
r14310 cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 testedwith = 'ships-with-hg-core'
Adrian Buehlmann
purge: use cmdutil.command decorator
r14310
@command('purge|clean',
[('a', 'abort-on-err', None, _('abort if an error occurs')),
('', 'all', None, _('purge ignored files too')),
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 ('', 'dirs', None, _('purge empty directories')),
('', 'files', None, _('purge files')),
Adrian Buehlmann
purge: use cmdutil.command decorator
r14310 ('p', 'print', None, _('print filenames instead of deleting them')),
('0', 'print0', None, _('end filenames with NUL, for use with xargs'
' (implies -p/--print)')),
Yuya Nishihara
commands: move templates of common command options to cmdutil (API)...
r32375 ] + cmdutil.walkopts,
Adrian Buehlmann
purge: use cmdutil.command decorator
r14310 _('hg purge [OPTION]... [DIR]...'))
Matt Mackall
purge: eliminate dopurge
r6573 def purge(ui, repo, *dirs, **opts):
Benjamin Pollack
1 file changed, 7 insertions(+), 9 deletions(-)...
r7605 '''removes files not tracked by Mercurial
Matt Mackall
purge: eliminate dopurge
r6573
Martin Geisler
purge: wrap docstrings at 70 characters
r9270 Delete files not known to Mercurial. This is useful to test local
and uncommitted changes in an otherwise-clean source tree.
Matt Mackall
purge: eliminate dopurge
r6573
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 This means that purge will delete the following by default:
Martin Geisler
purge: fix formatting of lists with proper reST markup
r9215
Martin Geisler
Use hg role in help strings
r10973 - Unknown files: files marked with "?" by :hg:`status`
Martin Geisler
purge: wrap docstrings at 70 characters
r9270 - Empty directories: in fact Mercurial ignores directories unless
they contain files under source control management
Martin Geisler
purge: fix formatting of lists with proper reST markup
r9215
Matt Mackall
purge: eliminate dopurge
r6573 But it will leave untouched:
Martin Geisler
purge: fix formatting of lists with proper reST markup
r9215
- Modified and unmodified tracked files
- Ignored files (unless --all is specified)
Martin Geisler
Use hg role in help strings
r10973 - New files added to the repository (with :hg:`add`)
Matt Mackall
purge: eliminate dopurge
r6573
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 The --files and --dirs options can be used to direct purge to delete
only files, only directories, or both. If neither option is given,
both will be deleted.
Matt Mackall
purge: eliminate dopurge
r6573 If directories are given on the command line, only files in these
directories are considered.
Martin Geisler
purge: wrap docstrings at 70 characters
r9270 Be careful with purge, as you could irreversibly delete some files
you forgot to add to the repository. If you only want to print the
list of files that this program would delete, use the --print
option.
Matt Mackall
purge: eliminate dopurge
r6573 '''
Augie Fackler
purge: apply byteskwargs to opts, fixing all python3 issues here...
r36589 opts = pycompat.byteskwargs(opts)
Gregory Szorc
purge: use opts.get()...
r29222 act = not opts.get('print')
Matt Mackall
purge: cleanup...
r6757 eol = '\n'
Gregory Szorc
purge: use opts.get()...
r29222 if opts.get('print0'):
Matt Mackall
purge: cleanup...
r6757 eol = '\0'
act = False # --print0 implies --print
Gregory Szorc
purge: use opts.get()...
r29222 removefiles = opts.get('files')
removedirs = opts.get('dirs')
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 if not removefiles and not removedirs:
removefiles = True
removedirs = True
Emanuele Aina
Move back the purge extension in hgext
r4311
def remove(remove_func, name):
if act:
try:
Martin Geisler
use repo.wjoin(f) instead of os.path.join(repo.root, f)
r7570 remove_func(repo.wjoin(name))
Benoit Boissinot
remove unused variables
r7280 except OSError:
Matt Mackall
purge: cleanup...
r6757 m = _('%s cannot be removed') % name
Gregory Szorc
purge: use opts.get()...
r29222 if opts.get('abort_on_err'):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(m)
Matt Mackall
purge: cleanup...
r6757 ui.warn(_('warning: %s\n') % m)
Emanuele Aina
Move back the purge extension in hgext
r4311 else:
ui.write('%s%s' % (name, eol))
Matt Mackall
scmutil: switch match users to supplying contexts...
r14671 match = scmutil.match(repo[None], dirs, opts)
Siddharth Agarwal
purge: avoid full walks when directories aren't purged...
r22265 if removedirs:
directories = []
match.explicitdir = match.traversedir = directories.append
Gregory Szorc
purge: use opts.get()...
r29222 status = repo.status(match=match, ignored=opts.get('all'), unknown=True)
Emanuele Aina
Move back the purge extension in hgext
r4311
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 if removefiles:
Martin von Zweigbergk
purge: access status fields by name rather than index
r22920 for f in sorted(status.unknown + status.ignored):
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 if act:
ui.note(_('removing file %s\n') % f)
Christian Ebert
purge: prefer util.unlink instead over own removefile
r21983 remove(util.unlink, f)
Emanuele Aina
Move back the purge extension in hgext
r4311
Ben Kehoe
purge: add options for deleting only files or only directories
r21853 if removedirs:
for f in sorted(directories, reverse=True):
if match(f) and not os.listdir(repo.wjoin(f)):
if act:
ui.note(_('removing directory %s\n') % f)
remove(os.rmdir, f)