This is an archive of the discontinued Mercurial Phabricator instance.

Differential D525

rebase: add a changes flag which will tell about the hash changes
AbandonedPublic

Authored by pulkit on Aug 26 2017, 7:52 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Summary

The --changes flag to rebase will tell user about the hash changes which
happened during the rebase once the rebase completes. The hash changes can also
be outputed as JSON by using --changes -q -Tjson. -q is required so that
things which are outputed by ui.status() are prevented and we get a JSON only
with the hash changes.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 26 2017, 7:52 AM
pulkit edited the summary of this revision. (Show Details)Aug 26 2017, 7:55 AM
quark added a subscriber: quark.EditedAug 26 2017, 12:14 PM

I think a more general purposed approach is preferred here - see D173. If we make {changes} part of the template language (as suggested by the inline comment), the implementation of {changes} could be shared across multiple commands.

EDIT: the inline comment {changes|"..."} should be changed to {changes%"..."}.

hgext/rebase.py
487–488

I think automation may want full hash here. So we might want to allow that somehow.

Maybe we can use template to customize the output, like:

-T '{changes}' # default
-T '{changes|"{oldnode|short} -> {newnode|short}"}' # customized entry
-T '{changes|json}' # json formatted
pulkit added a comment.Aug 27 2017, 4:57 PM
In D525#8480, @quark wrote:

I think a more general purposed approach is preferred here - see D173. If we make {changes} part of the template language (as suggested by the inline comment), the implementation of {changes} could be shared across multiple commands.

I like the idea. I will try to send patches to use formatter there instead of using ui.status.

hgext/rebase.py
487–488

That looks like a nice idea, but since other outputs are repo.ui.* things and as far as I know, they can be templated, so we are only left with hash change output which we are adding.

durin42 requested changes to this revision.Aug 28 2017, 3:11 PM
durin42 added a subscriber: durin42.
durin42 added inline comments.
hgext/rebase.py
487–488

Definitely make these full hashes, and then have the default template for this output them as short hashes.

This revision now requires changes to proceed.Aug 28 2017, 3:11 PM
yuja added a subscriber: yuja.Aug 29 2017, 9:38 AM
yuja added inline comments.
hgext/rebase.py
487–488

fm.hexfunc can be used.

pulkit added inline comments.Aug 29 2017, 11:33 AM
hgext/rebase.py
487–488

Ah, revisiting this just realized my mistake. I wanted to say "repo.ui.* things can't be templated". Instead I said the opposite :(. @yuja Thanks for the suggestion.

pulkit edited edge metadata.Aug 29 2017, 12:06 PM
pulkit updated this revision to Diff 1406.
pulkit abandoned this revision.Aug 31 2017, 11:36 AM

Abandoning in favor of D581 and D582 which seems to be a more general approach.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (14 lines)
Mtests/test-rebase-base.t (43 lines)

Diff 1406

hgext/rebase.py

newwd = self.state.get(self.originalwd, self.originalwd) newwd = self.state.get(self.originalwd, self.originalwd)
if newwd < 0: if newwd < 0:
# original directory is a parent of rebase set root or ignored # original directory is a parent of rebase set root or ignored
newwd = self.originalwd newwd = self.originalwd
if newwd not in [c.rev() for c in repo[None].parents()]: if newwd not in [c.rev() for c in repo[None].parents()]:
ui.note(_("update back to initial working directory parent\n")) ui.note(_("update back to initial working directory parent\n"))
hg.updaterepo(repo, newwd, False) hg.updaterepo(repo, newwd, False)
if opts.get('changes'):
fm = ui.formatter('rebase', opts)
label = 'rebase.nodes'
for oldrev, newrev in self.state.iteritems():
fm.startitem()
hexfunc = fm.hexfunc
oldhash = repo[oldrev].node()
quarkUnsubmitted
Not Done

I think automation may want full hash here. So we might want to allow that somehow.

Maybe we can use template to customize the output, like:

-T '{changes}' # default
-T '{changes|"{oldnode|short} -> {newnode|short}"}' # customized entry
-T '{changes|json}' # json formatted
quark: I think automation may want full hash here. So we might want to allow that somehow. Maybe we…
pulkitAuthorUnsubmitted
Not Done

That looks like a nice idea, but since other outputs are repo.ui.* things and as far as I know, they can be templated, so we are only left with hash change output which we are adding.

pulkit: That looks like a nice idea, but since other outputs are repo.ui.* things and as far as I know…
durin42Unsubmitted
Not Done

Definitely make these full hashes, and then have the default template for this output them as short hashes.

durin42: Definitely make these full hashes, and then have the default template for this output them as…
yujaUnsubmitted
Not Done

fm.hexfunc can be used.

yuja: `fm.hexfunc` can be used.
pulkitAuthorUnsubmitted
Not Done

Ah, revisiting this just realized my mistake. I wanted to say "repo.ui.* things can't be templated". Instead I said the opposite :(. @yuja Thanks for the suggestion.

pulkit: Ah, revisiting this just realized my mistake. I wanted to say "repo.ui.* things can't be…
newhash = repo[newrev].node()
fm.write('oldnode', '%s is changed to ', hexfunc(oldhash),
label=label)
fm.write('newnode', '%s\n', hexfunc(newhash), label=label)
fm.end()
if not self.keepf: if not self.keepf:
collapsedas = None collapsedas = None
if self.collapsef: if self.collapsef:
collapsedas = newnode collapsedas = newnode
clearrebased(ui, repo, self.dest, self.state, self.skipped, clearrebased(ui, repo, self.dest, self.state, self.skipped,
collapsedas) collapsedas)
clearstatus(repo) clearstatus(repo)
('l', 'logfile', '', ('l', 'logfile', '',
_('read collapse commit message from file'), _('FILE')), _('read collapse commit message from file'), _('FILE')),
('k', 'keep', False, _('keep original changesets')), ('k', 'keep', False, _('keep original changesets')),
('', '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')),
('', 'changes', False, _('show the node changes (EXPERIMENTAl)')),
('a', 'abort', False, _('abort an interrupted rebase'))] + ('a', 'abort', False, _('abort an interrupted rebase'))] +
templateopts, templateopts,
_('[-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

tests/test-rebase-base.t

o 3: B o 3: B
| |
o 2: Z o 2: Z
| |
o 1: Y o 1: Y
| |
o 0: A o 0: A
Enabling obsolete markers
$ cat >> $HGRCPATH << EOF
> [experimental]
> stabilization=createmarkers,exchange
> EOF
Testing the --changes flag
$ hg rebase -s 4 -d 2 --changes
rebasing 4:abc67d0cf023 "C"
rebasing 5:a701fddfacec "D" (tip)
abc67d0cf023 is changed to 2e4b11ea9404
a701fddfacec is changed to 003ba25ccc56
$ hg tglog
o 7: D
|
o 6: C
|
| o 3: B
|/
o 2: Z
|
o 1: Y
|
o 0: A
Only json output using `--changes -q -Tjson`
$ hg rebase -s 6 -d 3 --changes -q -Tjson
[
{
"newnode": "583565ab89ac6de0871825d399e305b01d364312",
"oldnode": "2e4b11ea9404550c296bd4d3aedf1f22fdd1af8b"
},
{
"newnode": "38bd5f90ba6afc7ea705c11010eeef01bd3fb2f8",
"oldnode": "003ba25ccc5677a25f8a186751b789f2da5aad53"
}
]
$ cd .. $ cd ..