This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4998

absorb: print summary of changesets affected
ClosedPublic

Authored by mbthomas on Oct 12 2018, 11:51 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2c5316796f45: absorb: print summary of changesets affected

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

mbthomas created this revision.Oct 12 2018, 11:51 AM
indygreg accepted this revision.Oct 12 2018, 1:36 PM
indygreg added a subscriber: indygreg.

This seems reasonable as a first "something better."

This revision is now accepted and ready to land.Oct 12 2018, 1:36 PM
Closed by commit rHG2c5316796f45: absorb: print summary of changesets affected (authored by mbthomas). · Explain WhyOct 12 2018, 1:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (19 lines)
Mtests/test-absorb-rename.t (28 lines)
Mtests/test-absorb.t (25 lines)

Diff 11935

hgext/absorb.py

# only check 50 recent non-public changesets at most # only check 50 recent non-public changesets at most
max-stack-size = 50 max-stack-size = 50
# whether to add noise to new commits to avoid obsolescence cycle # whether to add noise to new commits to avoid obsolescence cycle
add-noise = 1 add-noise = 1
# make `amend --correlated` a shortcut to the main command # make `amend --correlated` a shortcut to the main command
amend-flag = correlated amend-flag = correlated
[color] [color]
absorb.description = yellow
absorb.node = blue bold absorb.node = blue bold
absorb.path = bold absorb.path = bold
""" """
# TODO: # TODO:
# * Rename config items to [commands] namespace # * Rename config items to [commands] namespace
# * Converge getdraftstack() with other code in core # * Converge getdraftstack() with other code in core
# * move many attributes on fixupstate to be private # * move many attributes on fixupstate to be private
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem('absorb', 'add-noise', default=True) configitem('absorb', 'add-noise', default=True)
configitem('absorb', 'amend-flag', default=None) configitem('absorb', 'amend-flag', default=None)
configitem('absorb', 'max-stack-size', default=50) configitem('absorb', 'max-stack-size', default=50)
colortable = { colortable = {
'absorb.description': 'yellow',
'absorb.node': 'blue bold', 'absorb.node': 'blue bold',
'absorb.path': 'bold', 'absorb.path': 'bold',
} }
defaultdict = collections.defaultdict defaultdict = collections.defaultdict
class nullui(object): class nullui(object):
"""blank ui object doing nothing""" """blank ui object doing nothing"""
if self.ui.debugflag: if self.ui.debugflag:
assert self._checkoutlinelog() == self.contents assert self._checkoutlinelog() == self.contents
# following fields will be filled later # following fields will be filled later
self.chunkstats = [0, 0] # [adopted, total : int] self.chunkstats = [0, 0] # [adopted, total : int]
self.targetlines = [] # [str] self.targetlines = [] # [str]
self.fixups = [] # [(linelog rev, a1, a2, b1, b2)] self.fixups = [] # [(linelog rev, a1, a2, b1, b2)]
self.finalcontents = [] # [str] self.finalcontents = [] # [str]
self.ctxaffected = set()
def diffwith(self, targetfctx, fm=None): def diffwith(self, targetfctx, fm=None):
"""calculate fixups needed by examining the differences between """calculate fixups needed by examining the differences between
self.fctxs[-1] and targetfctx, chunk by chunk. self.fctxs[-1] and targetfctx, chunk by chunk.
targetfctx is the target state we move towards. we may or may not be targetfctx is the target state we move towards. we may or may not be
able to get there because not all modified chunks can be amended into able to get there because not all modified chunks can be amended into
a non-public fctx unambiguously. a non-public fctx unambiguously.
def writeline(idx, diffchar, line, linetype, linelabel): def writeline(idx, diffchar, line, linetype, linelabel):
fm.startitem() fm.startitem()
node = '' node = ''
if idx: if idx:
ctx = self.fctxs[idx] ctx = self.fctxs[idx]
fm.context(fctx=ctx) fm.context(fctx=ctx)
node = ctx.hex() node = ctx.hex()
self.ctxaffected.add(ctx.changectx())
fm.write('node', '%-7.7s ', node, label='absorb.node') fm.write('node', '%-7.7s ', node, label='absorb.node')
fm.write('diffchar ' + linetype, '%s%s\n', diffchar, line, fm.write('diffchar ' + linetype, '%s%s\n', diffchar, line,
label=linelabel) label=linelabel)
fm.data(path=self.path, linetype=linetype) fm.data(path=self.path, linetype=linetype)
for i in pycompat.xrange(a1, a2): for i in pycompat.xrange(a1, a2):
writeline(aidxs[i - a1], '-', trim(alines[i]), 'deleted', writeline(aidxs[i - a1], '-', trim(alines[i]), 'deleted',
'diff.deleted') 'diff.deleted')
# following fields will be filled later # following fields will be filled later
self.paths = [] # [str] self.paths = [] # [str]
self.status = None # ctx.status output self.status = None # ctx.status output
self.fctxmap = {} # {path: {ctx: fctx}} self.fctxmap = {} # {path: {ctx: fctx}}
self.fixupmap = {} # {path: filefixupstate} self.fixupmap = {} # {path: filefixupstate}
self.replacemap = {} # {oldnode: newnode or None} self.replacemap = {} # {oldnode: newnode or None}
self.finalnode = None # head after all fixups self.finalnode = None # head after all fixups
self.ctxaffected = set() # ctx that will be absorbed into
def diffwith(self, targetctx, match=None, fm=None): def diffwith(self, targetctx, match=None, fm=None):
"""diff and prepare fixups. update self.fixupmap, self.paths""" """diff and prepare fixups. update self.fixupmap, self.paths"""
# only care about modified files # only care about modified files
self.status = self.stack[-1].status(targetctx, match) self.status = self.stack[-1].status(targetctx, match)
self.paths = [] self.paths = []
# but if --edit-lines is used, the user may want to edit files # but if --edit-lines is used, the user may want to edit files
# even if they are not modified # even if they are not modified
if fm is not None: if fm is not None:
fm.startitem() fm.startitem()
fm.plain('showing changes for ') fm.plain('showing changes for ')
fm.write('path', '%s\n', path, label='absorb.path') fm.write('path', '%s\n', path, label='absorb.path')
fm.data(linetype='path') fm.data(linetype='path')
fstate.diffwith(targetfctx, fm) fstate.diffwith(targetfctx, fm)
self.fixupmap[path] = fstate self.fixupmap[path] = fstate
self.paths.append(path) self.paths.append(path)
self.ctxaffected.update(fstate.ctxaffected)
def apply(self): def apply(self):
"""apply fixups to individual filefixupstates""" """apply fixups to individual filefixupstates"""
for path, state in self.fixupmap.iteritems(): for path, state in self.fixupmap.iteritems():
if self.ui.debugflag: if self.ui.debugflag:
self.ui.write(_('applying fixups to %s\n') % path) self.ui.write(_('applying fixups to %s\n') % path)
state.apply() state.apply()
origchunks = patch.parsepatch(diff) origchunks = patch.parsepatch(diff)
chunks = cmdutil.recordfilter(ui, origchunks)[0] chunks = cmdutil.recordfilter(ui, origchunks)[0]
targetctx = overlaydiffcontext(stack[-1], chunks) targetctx = overlaydiffcontext(stack[-1], chunks)
fm = None fm = None
if opts.get('print_changes'): if opts.get('print_changes'):
fm = ui.formatter('absorb', opts) fm = ui.formatter('absorb', opts)
state.diffwith(targetctx, matcher, fm) state.diffwith(targetctx, matcher, fm)
if fm is not None: if fm is not None:
fm.startitem()
fm.write("count", "\n%d changesets affected\n", len(state.ctxaffected))
fm.data(linetype='summary')
for ctx in reversed(stack):
if ctx not in state.ctxaffected:
continue
fm.startitem()
fm.context(ctx=ctx)
fm.data(linetype='changeset')
fm.write('node', '%-7.7s ', ctx.hex(), label='absorb.node')
descfirstline = ctx.description().splitlines()[0]
fm.write('descfirstline', '%s\n', descfirstline,
label='absorb.description')
fm.end() fm.end()
if not opts.get('dry_run'): if not opts.get('dry_run'):
state.apply() state.apply()
if state.commit(): if state.commit():
state.printchunkstats() state.printchunkstats()
elif not ui.quiet: elif not ui.quiet:
ui.write(_('nothing applied\n')) ui.write(_('nothing applied\n'))
return state return state

tests/test-absorb-rename.t

showing changes for a showing changes for a
@@ -0,3 +0,3 @@ @@ -0,3 +0,3 @@
eff892d -1 eff892d -1
bf56e1f -2 bf56e1f -2
0b888b0 -3 0b888b0 -3
eff892d +1a eff892d +1a
bf56e1f +2a bf56e1f +2a
0b888b0 +3a 0b888b0 +3a
3 changesets affected
0b888b0 3
bf56e1f 2
eff892d 1
$ hg status $ hg status
$ hg annotate -ncf a $ hg annotate -ncf a
0 5d1c5620e6f2 a: 1a 0 5d1c5620e6f2 a: 1a
1 9a14ffe67ae9 b: 2a 1 9a14ffe67ae9 b: 2a
2 9191d121a268 a: 3a 2 9191d121a268 a: 3a
when the first changeset is public when the first changeset is public
$ hg phase --public -r 0 $ hg phase --public -r 0
$ sedi 's/a/A/' a $ sedi 's/a/A/' a
$ hg absorb -pq $ hg absorb -pq
showing changes for a showing changes for a
@@ -0,3 +0,3 @@ @@ -0,3 +0,3 @@
-1a -1a
9a14ffe -2a 9a14ffe -2a
9191d12 -3a 9191d12 -3a
+1A +1A
9a14ffe +2A 9a14ffe +2A
9191d12 +3A 9191d12 +3A
2 changesets affected
9191d12 3
9a14ffe 2
$ hg diff $ hg diff
diff --git a/a b/a diff --git a/a b/a
--- a/a --- a/a
+++ b/a +++ b/a
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
-1a -1a
+1A +1A
2A 2A
eff892d -1 eff892d -1
eff892d +1a eff892d +1a
showing changes for b showing changes for b
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
-1 -1
17b7212 -2 17b7212 -2
+1b +1b
17b7212 +2b 17b7212 +2b
2 changesets affected
17b7212 2
eff892d 1
$ hg diff $ hg diff
diff --git a/b b/b diff --git a/b b/b
--- a/b --- a/b
+++ b/b +++ b/b
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-1 -1
+1b +1b
2b 2b
-1 -1
e62c256 -2 e62c256 -2
+1a +1a
e62c256 +2a e62c256 +2a
showing changes for b showing changes for b
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
55105f9 -1 55105f9 -1
55105f9 +1a 55105f9 +1a
2 changesets affected
e62c256 2
55105f9 1
$ hg diff $ hg diff
diff --git a/a b/a diff --git a/a b/a
--- a/a --- a/a
+++ b/a +++ b/a
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-1 -1
+1a +1a
2a 2a
55105f9 +1a 55105f9 +1a
366daad +2a 366daad +2a
showing changes for c showing changes for c
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
-1 -1
366daad -3 366daad -3
+1c +1c
366daad +3c 366daad +3c
2 changesets affected
366daad cp
55105f9 1
$ hg log -G -p -T '{rev}:{node|short} {desc}\n' $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
@ 1:70606019f91b cp @ 1:70606019f91b cp
| diff --git a/b b/a | diff --git a/b b/a
| rename from b | rename from b
| rename to a | rename to a
| --- a/b | --- a/b
| +++ b/a | +++ b/a
| @@ -1,1 +1,2 @@ | @@ -1,1 +1,2 @@
run absorb again would apply the change to c run absorb again would apply the change to c
$ hg absorb -pq $ hg absorb -pq
showing changes for c showing changes for c
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
7060601 -1 7060601 -1
7060601 +1c 7060601 +1c
1 changesets affected
7060601 cp
$ hg log -G -p -T '{rev}:{node|short} {desc}\n' $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
@ 1:8bd536cce368 cp @ 1:8bd536cce368 cp
| diff --git a/b b/a | diff --git a/b b/a
| rename from b | rename from b
| rename to a | rename to a
| --- a/b | --- a/b
| +++ b/a | +++ b/a
| @@ -1,1 +1,2 @@ | @@ -1,1 +1,2 @@
55105f9 +1d 55105f9 +1d
7bc3d43 +4d 7bc3d43 +4d
showing changes for e showing changes for e
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
-1 -1
7bc3d43 -2 7bc3d43 -2
+1e +1e
7bc3d43 +2e 7bc3d43 +2e
2 changesets affected
7bc3d43 cp
55105f9 1
$ hg diff $ hg diff
diff --git a/e b/e diff --git a/e b/e
--- a/e --- a/e
+++ b/e +++ b/e
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-1 -1
+1e +1e
2e 2e

tests/test-absorb.t

5c5f952 -2 5c5f952 -2
4ec16f8 +1a 4ec16f8 +1a
5c5f952 +2b 5c5f952 +2b
@@ -3,2 +3,2 @@ @@ -3,2 +3,2 @@
ad8b8b7 -4 ad8b8b7 -4
4f55fa6 -5 4f55fa6 -5
ad8b8b7 +4d ad8b8b7 +4d
4f55fa6 +5e 4f55fa6 +5e
4 changesets affected
4f55fa6 commit 5
ad8b8b7 commit 4
5c5f952 commit 2
4ec16f8 commit 1
Run absorb: Run absorb:
$ hg absorb $ hg absorb
saved backup bundle to * (glob) saved backup bundle to * (glob)
2 of 2 chunk(s) applied 2 of 2 chunk(s) applied
$ hg annotate a $ hg annotate a
0: 1a 0: 1a
1: 2b 1: 2b
$ hg absorb -pn $ hg absorb -pn
showing changes for a showing changes for a
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
-Insert before 2b -Insert before 2b
+insert before 2b +insert before 2b
@@ -3,1 +3,1 @@ @@ -3,1 +3,1 @@
85b4e0e -Insert aftert 4d 85b4e0e -Insert aftert 4d
85b4e0e +insert aftert 4d 85b4e0e +insert aftert 4d
1 changesets affected
85b4e0e commit 4
$ hg absorb $ hg absorb
saved backup bundle to * (glob) saved backup bundle to * (glob)
1 of 2 chunk(s) applied 1 of 2 chunk(s) applied
$ hg diff -U 0 $ hg diff -U 0
diff -r 1c8eadede62a a diff -r 1c8eadede62a a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
+a line 1 +a line 1
+a line 2 +a line 2
showing changes for b showing changes for b
@@ -0,2 +0,2 @@ @@ -0,2 +0,2 @@
-b Line 1 -b Line 1
712d16a -b Line 2 712d16a -b Line 2
+b line 1 +b line 1
712d16a +b line 2 712d16a +b line 2
1 changesets affected
712d16a commit b 2
Test obsolete markers creation: Test obsolete markers creation:
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> [absorb] > [absorb]
> add-noise=1 > add-noise=1
> EOF > EOF
#endif #endif
$ echo bla > foo.py $ echo bla > foo.py
$ hg absorb --dry-run --print-changes $ hg absorb --dry-run --print-changes
showing changes for foo.py showing changes for foo.py
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
99b4ae7 - 99b4ae7 -
99b4ae7 +bla 99b4ae7 +bla
1 changesets affected
99b4ae7 foo
$ hg absorb $ hg absorb
1 of 1 chunk(s) applied 1 of 1 chunk(s) applied
$ hg diff -c . $ hg diff -c .
diff --git a/foo.py b/foo.py diff --git a/foo.py b/foo.py
new file mode 100755 new file mode 100755
--- /dev/null --- /dev/null
+++ b/foo.py +++ b/foo.py
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
showing changes for a showing changes for a
@@ -2,0 +2,1 @@ @@ -2,0 +2,1 @@
bfafb49 +3 bfafb49 +3
showing changes for b showing changes for b
@@ -1,3 +1,0 @@ @@ -1,3 +1,0 @@
1154859 -2 1154859 -2
30970db -3 30970db -3
a393a58 -4 a393a58 -4
4 changesets affected
a393a58 b4
30970db b3
1154859 b12
bfafb49 a12
$ hg absorb -v | grep became $ hg absorb -v | grep became
0:bfafb49242db: 1 file(s) changed, became 4:1a2de97fc652 0:bfafb49242db: 1 file(s) changed, became 4:1a2de97fc652
1:115485984805: 2 file(s) changed, became 5:0c930dfab74c 1:115485984805: 2 file(s) changed, became 5:0c930dfab74c
2:30970dbf7b40: became empty and was dropped 2:30970dbf7b40: became empty and was dropped
3:a393a58b9a85: became empty and was dropped 3:a393a58b9a85: became empty and was dropped
$ hg log -T '{rev} {desc}\n' -Gp $ hg log -T '{rev} {desc}\n' -Gp
@ 5 b12 @ 5 b12
| diff --git a/b b/b | diff --git a/b b/b
$ hg id $ hg id
82dbe7fd19f0 tip 82dbe7fd19f0 tip
$ hg revert -r 0 a $ hg revert -r 0 a
$ hg absorb -pn $ hg absorb -pn
showing changes for a showing changes for a
@@ -2,2 +2,0 @@ @@ -2,2 +2,0 @@
f1c23dd -3 f1c23dd -3
82dbe7f -4 82dbe7f -4
2 changesets affected
82dbe7f a1234
f1c23dd a123
$ hg absorb --verbose $ hg absorb --verbose
1:f1c23dd5d08d: became empty and was dropped 1:f1c23dd5d08d: became empty and was dropped
2:82dbe7fd19f0: became empty and was dropped 2:82dbe7fd19f0: became empty and was dropped
a: 1 of 1 chunk(s) applied a: 1 of 1 chunk(s) applied
$ hg id $ hg id
bfafb49242db tip bfafb49242db tip