This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3887

rebase: support "history-editing-backup" config option
ClosedPublic

Authored by khanchi97 on Jul 5 2018, 1:38 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG2002c193f2bc: rebase: support "history-editing-backup" config option
rHG7de767e15f52: rebase: support "history-editing-backup" config option

Summary

If you don't want to store any backup while rebasing, you can
use history-editing-backup config option.
[ui]
history-editing-backup = # True or False

Current status of list of commands which supports this config:

histedit
rebase

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Jul 5 2018, 1:38 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 5 2018, 1:38 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

Added --no-backup option which gives functionality to
not save backup copies of files.

Can you elaborate why we want this option?

I'm -0 on this because it's unclear when the --no-backup option makes a
difference. --abort isn't the only way to strip revisions while rebasing.

In D3887#60749, @yuja wrote:
Added --no-backup option which gives functionality to
not save backup copies of files.
Can you elaborate why we want this option?

The idea was to add --no-backup option in all those commands which alter history. For this one, let say if someone wants to abort a rebase in between then a --no-backup option should be available (same as histedit)

I'm -0 on this because it's unclear when the --no-backup option makes a
difference. --abort isn't the only way to strip revisions while rebasing.

Oh, I thought --abort is the only way to strip revisions. Shall I try to cover all other cases also where we strip csets; Or If it is not required I can leave it here.

The idea was to add --no-backup option in all those commands which alter
history. For this one, let say if someone wants to abort a rebase in between
then a --no-backup option should be available (same as histedit)

If he don't want any backup bundle on history editing, it might be better
to add a config knob to turn off the feature than forcing him to always
specify --no-backup.

histedit and rebase are different from strip in that the user doesn't intend
to "remove" changesets.

Oh, I thought --abort is the only way to strip revisions.

Pre-obsmarker rebase will strip rebased revisions.

Shall I try to cover all other cases also where we strip csets; Or If it is
not required I can leave it here.

I don't have strong opinion about that, but it's probably better to add a
test with some comment saying --no-backup doesn't work and should be fixed
later.

In D3887#60752, @yuja wrote:

The idea was to add --no-backup option in all those commands which alter
history. For this one, let say if someone wants to abort a rebase in between
then a --no-backup option should be available (same as histedit)

If he don't want any backup bundle on history editing, it might be better
to add a config knob to turn off the feature than forcing him to always
specify --no-backup.

I agree with Yuya here that a config option is better here.

@yuja @pulkit Definitely, adding a config option is better than any other alternative. Can I start to work on this? (I mean adding config option which will work for all history editing commands)

@yuja @pulkit Definitely, adding a config option is better than any other alternative. Can I start to work on this? (I mean adding config option which will work for all history editing commands)

Sounds good to me, though I don't have any good name for the config option.

To be clear, I think hg strip should be out of the control of the config
option to be added, because the strip in that case isn't a side effect of
history editing.

khanchi97 edited the summary of this revision. (Show Details)Jul 20 2018, 4:04 PM

khanchi97 retitled this revision from rebase: add --no-backup option to rebase: support "history-editing-backup" config option.

khanchi97 added a child revision: D3968: amend: support "history-editing-backup" config option.

khanchi97 updated this revision to Diff 9639.

Queued, thanks.

@@ -829,6 +833,8 @@
userrevs = list(repo.revs(opts.get('auto_orphans')))
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts['dest'] = '_destautoorphanrebase(SRC)'
+ backup = ui.configbool('ui', 'history-editing-backup')
+ opts['backup'] = backup

This seems getting ugly. Maybe the option can be carried by rbsrt instead?

self.backupf = ui.configbool('ui', 'history-editing-backup')

Closed by commit rHG7de767e15f52: rebase: support "history-editing-backup" config option (authored by khanchi97). · Explain WhyAug 2 2018, 9:51 AM

This revision was automatically updated to reflect the committed changes.

In D3887#62825, @yuja wrote:
Queued, thanks.
@@ -829,6 +833,8 @@
userrevs = list(repo.revs(opts.get('auto_orphans')))
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts['dest'] = '_destautoorphanrebase(SRC)'
+ backup = ui.configbool('ui', 'history-editing-backup')
+ opts['backup'] = backup
This seems getting ugly. Maybe the option can be carried by rbsrt instead?
self.backupf = ui.configbool('ui', 'history-editing-backup')

I like Yuya's suggestion here. @khanchi97 can you please follow-up?

In D3887#62850, @pulkit wrote:
In D3887#62825, @yuja wrote:
Queued, thanks.
@@ -829,6 +833,8 @@
userrevs = list(repo.revs(opts.get('auto_orphans')))
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts['dest'] = '_destautoorphanrebase(SRC)'
+ backup = ui.configbool('ui', 'history-editing-backup')
+ opts['backup'] = backup
This seems getting ugly. Maybe the option can be carried by rbsrt instead?
self.backupf = ui.configbool('ui', 'history-editing-backup')
I like Yuya's suggestion here. @khanchi97 can you please follow-up?

Okay, I will send a follow-up.

Revision Contents
Changeset List

			Path	Packages
M			hgext/rebase.py (4 lines)
M			tests/test-rebase-abort.t (47 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	9441		Jul 5 2018, 1:38 AM	★	★
Diff 2	9639		Jul 20 2018, 4:03 PM	★	★
Diff 3	9786	rHG7de767e15f527a51d0858a8976b99c122410c266	Jul 5 2018, 1:12 AM	★	★

Commit	Parents	Author	Summary	Date
		Sushil khanchi		Jul 5 2018, 1:12 AM

Status	Author	Revision
Closed	khanchi97	D3968 amend: support "history-editing-backup" config option
Closed	khanchi97	D3887 rebase: support "history-editing-backup" config option
Closed	khanchi97	D3886 strip: improve help text for --no-backup option
Closed	khanchi97	D3885 histedit: improve help text for --no-backup option

Diff 9441

hgext/rebase.py

	('', 'keepbranches', False, _('keep original branch names')),			('', 'keepbranches', False, _('keep original branch names')),
	('D', 'detach', False, _('(DEPRECATED)')),			('D', 'detach', False, _('(DEPRECATED)')),
	('i', 'interactive', False, _('(DEPRECATED)')),			('i', 'interactive', False, _('(DEPRECATED)')),
	('t', 'tool', '', _('specify merge tool')),			('t', 'tool', '', _('specify merge tool')),
	('c', 'continue', False, _('continue an interrupted rebase')),			('c', 'continue', False, _('continue an interrupted rebase')),
	('a', 'abort', False, _('abort an interrupted rebase')),			('a', 'abort', False, _('abort an interrupted rebase')),
	('', 'auto-orphans', '', _('automatically rebase orphan revisions '			('', 'auto-orphans', '', _('automatically rebase orphan revisions '
	'in the specified revset (EXPERIMENTAL)')),			'in the specified revset (EXPERIMENTAL)')),
				('', 'no-backup', False, _('do not save backup copies of files')),
	] + cmdutil.dryrunopts + cmdutil.formatteropts,			] + cmdutil.dryrunopts + cmdutil.formatteropts,
	_('[-s REV \| -b REV] [-d REV] [OPTION]'))			_('[-s REV \| -b REV] [-d REV] [OPTION]'))
	def rebase(ui, repo, **opts):			def rebase(ui, repo, **opts):
	"""move changeset (and descendants) to a different branch			"""move changeset (and descendants) to a different branch

	Rebase uses repeated merging to graft changesets from one part of			Rebase uses repeated merging to graft changesets from one part of
	history (the source) onto another (the destination). This can be			history (the source) onto another (the destination). This can be
	useful for linearizing local changes relative to a master			useful for linearizing local changes relative to a master
	srcf = opts.get('source', None)			srcf = opts.get('source', None)
	basef = opts.get('base', None)			basef = opts.get('base', None)
	revf = opts.get('rev', [])			revf = opts.get('rev', [])
	# search default destination in this space			# search default destination in this space
	# used in the 'hg pull --rebase' case, see issue 5214.			# used in the 'hg pull --rebase' case, see issue 5214.
	destspace = opts.get('_destspace')			destspace = opts.get('_destspace')
	contf = opts.get('continue')			contf = opts.get('continue')
	abortf = opts.get('abort')			abortf = opts.get('abort')
				backup = not opts.get('no_backup')
	if opts.get('interactive'):			if opts.get('interactive'):
	try:			try:
	if extensions.find('histedit'):			if extensions.find('histedit'):
	enablehistedit = ''			enablehistedit = ''
	except KeyError:			except KeyError:
	enablehistedit = " --config extensions.histedit="			enablehistedit = " --config extensions.histedit="
	help = "hg%s help -e histedit" % enablehistedit			help = "hg%s help -e histedit" % enablehistedit
	msg = _("interactive history editing is supported by the "			msg = _("interactive history editing is supported by the "
	raise error.Abort(			raise error.Abort(
	_('abort and continue do not allow specifying revisions'))			_('abort and continue do not allow specifying revisions'))
	if abortf and opts.get('tool', False):			if abortf and opts.get('tool', False):
	ui.warn(_('tool option will be ignored\n'))			ui.warn(_('tool option will be ignored\n'))
	if contf:			if contf:
	ms = mergemod.mergestate.read(repo)			ms = mergemod.mergestate.read(repo)
	mergeutil.checkunresolved(ms)			mergeutil.checkunresolved(ms)

	retcode = rbsrt._prepareabortorcontinue(abortf)			retcode = rbsrt._prepareabortorcontinue(abortf, backup=backup)
	if retcode is not None:			if retcode is not None:
	return retcode			return retcode
	else:			else:
	destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef,			destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef,
	revf, destspace=destspace)			revf, destspace=destspace)
	retcode = rbsrt._preparenewrebase(destmap)			retcode = rbsrt._preparenewrebase(destmap)
	if retcode is not None:			if retcode is not None:
	return retcode			return retcode

tests/test-rebase-abort.t

	note: rebase of 3:0682fd3dabf5 created no changes to commit			note: rebase of 3:0682fd3dabf5 created no changes to commit
	warning: conflicts while merging root! (edit, then use 'hg resolve --mark')			warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see hg resolve, then hg rebase --continue)
	[1]			[1]
	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted
	$ cd ..			$ cd ..

				=========================
				Test --no-backup option \|
				=========================
				$ hg init nobackup
				$ cd nobackup
				$ echo a>a
				$ hg ci -qAma
				$ echo b>b
				$ hg ci -qAmb
				$ echo c>c
				$ hg ci -qAmc
				$ hg up 0 -q
				$ echo conflict>c
				$ hg ci -Am "conflict with c"
				adding c
				created new head
				$ hg log -GT "{rev}: {firstline(desc)}\n"
				@ 3: conflict with c
				\|
				\| o 2: c
				\| \|
				\| o 1: b
				\|/
				o 0: a

				$ hg rebase -s 1 -d .
				rebasing 1:d2ae7f538514 "b"
				rebasing 2:177f92b77385 "c"
				merging c
				warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]
				When --no-backup flag is not passed:
				$ hg rebase --abort
				saved backup bundle to $TESTTMP/nobackup/.hg/strip-backup/518b9bc3afb6-6c356d34-backup.hg
				rebase aborted
				$ hg rebase -s 1 -d .
				rebasing 1:d2ae7f538514 "b"
				rebasing 2:177f92b77385 "c"
				merging c
				warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]
				When --no-backup flag is passed:
				$ hg rebase --abort --no-backup
				rebase aborted
				$ cd ..