This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3756

rebase: delete the comment which was not following "do not eat my data"
ClosedPublic

Authored by khanchi97 on Jun 16 2018, 9:47 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd6686f864a70: rebase: delete the comment which was not following "do not eat my data"

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jun 16 2018, 9:47 AM
indygreg added subscribers: durin42, indygreg.Jun 16 2018, 4:15 PM

I'm unsure about this change. On one hand, the comment (which appears to have been added to mpm several years ago) implies that we never should have generated backups in this case. On the other, one of the key rules of a VCS is "don't eat my data." Even though we are aborting the operation, I could see some scenarios where someone would want a backup of the aborted/partially-completed rebase.

@durin42: what do you think?

durin42 added a comment.Jun 17 2018, 11:20 PM
In D3756#58937, @indygreg wrote:

I'm unsure about this change. On one hand, the comment (which appears to have been added to mpm several years ago) implies that we never should have generated backups in this case. On the other, one of the key rules of a VCS is "don't eat my data." Even though we are aborting the operation, I could see some scenarios where someone would want a backup of the aborted/partially-completed rebase.
@durin42: what do you think?

I think the paranoia is probably better overall? Maybe update the comment?

(I don't feel strongly.)

khanchi97 added a comment.Jun 17 2018, 11:46 PM

okay, I think following the key rule of VCS would be better. Shall I update
the comment instead?

khanchi97 retitled this revision from rebase: no need to backup rebased csets while aborting to rebase: delete the comment which was not following "do not eat my data".Jun 22 2018, 3:08 AM
khanchi97 updated this revision to Diff 9253.
Closed by commit rHGd6686f864a70: rebase: delete the comment which was not following "do not eat my data" (authored by khanchi97). · Explain WhyJun 22 2018, 7:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (1 line)

Diff 9254

hgext/rebase.py

shouldupdate = repo['.'].rev() in updateifonnodes shouldupdate = repo['.'].rev() in updateifonnodes
# Update away from the rebase if necessary # Update away from the rebase if necessary
if shouldupdate or needupdate(repo, state): if shouldupdate or needupdate(repo, state):
mergemod.update(repo, originalwd, False, True) mergemod.update(repo, originalwd, False, True)
# Strip from the first rebased revision # Strip from the first rebased revision
if rebased: if rebased:
# no backup of rebased cset versions needed
repair.strip(repo.ui, repo, strippoints) repair.strip(repo.ui, repo, strippoints)
if activebookmark and activebookmark in repo._bookmarks: if activebookmark and activebookmark in repo._bookmarks:
bookmarks.activate(repo, activebookmark) bookmarks.activate(repo, activebookmark)
finally: finally:
clearstatus(repo) clearstatus(repo)
clearcollapsemsg(repo) clearcollapsemsg(repo)