This is an archive of the discontinued Mercurial Phabricator instance.

Differential D826

tests: more information added to obsmarkers
AbandonedPublic

Authored by ryanmce on Sep 27 2017, 9:03 AM.
Tags
None
Subscribers
mjpieters

Details

Reviewers
mjpieters
Group Reviewers
Restricted Project

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

ryanmce created this revision.Sep 27 2017, 9:03 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 27 2017, 9:03 AM
mjpieters requested changes to this revision.Sep 27 2017, 9:37 AM
mjpieters added a subscriber: mjpieters.

Sorry, I already pushed a change for the 'operation' info. I've asked a question about the Undone as markers on our Mercurial release list, I'm not sure it is intended.

This revision now requires changes to proceed.Sep 27 2017, 9:37 AM
ryanmce abandoned this revision.Sep 27 2017, 9:41 AM

Will let @mjpieters address later.

Revision Contents
Changeset List

PathPackages
Mtests/test-inhibit.t (10 lines)
Mtests/test-undo.t (10 lines)

Diff 2119

tests/test-inhibit.t

| | | |
x | 2 D b18e25de2cf5 x | 2 D b18e25de2cf5
| | | |
| x 1 B 112478962961 | x 1 B 112478962961
|/ |/
x 0 A 426bada5c675 x 0 A 426bada5c675
$ hg debugobsolete $ hg debugobsolete
112478962961147124edd43549aedd1a335e44bf b18e25de2cf5fc4699a029ed635882849e53ef73 4b61ff5c62e28cff36152201967390a6e7375604 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 112478962961147124edd43549aedd1a335e44bf b18e25de2cf5fc4699a029ed635882849e53ef73 4b61ff5c62e28cff36152201967390a6e7375604 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'}
4b61ff5c62e28cff36152201967390a6e7375604 ad6717a6a58e34efe818b17b745fb04e0d17d49e 0 (Thu Jan 01 00:00:01 1970 +0000) {'user': 'test'} 4b61ff5c62e28cff36152201967390a6e7375604 ad6717a6a58e34efe818b17b745fb04e0d17d49e 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'amend', 'user': 'test'}
ad6717a6a58e34efe818b17b745fb04e0d17d49e 0 {b18e25de2cf5fc4699a029ed635882849e53ef73} (Thu Jan 01 00:00:02 1970 +0000) {'user': 'test'} ad6717a6a58e34efe818b17b745fb04e0d17d49e 0 {b18e25de2cf5fc4699a029ed635882849e53ef73} (Thu Jan 01 00:00:02 1970 +0000) {'operation': 'prune', 'user': 'test'}
b18e25de2cf5fc4699a029ed635882849e53ef73 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:01 1970 +0000) {'user': 'test'} b18e25de2cf5fc4699a029ed635882849e53ef73 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'prune', 'user': 'test'}
426bada5c67598ca65036d57d9e4b64b0c1ce7a0 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 426bada5c67598ca65036d57d9e4b64b0c1ce7a0 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'prune', 'user': 'test'}
$ hg revivetest 'obsolete()' --config extensions.revivetest=$TESTTMP/revivetest.py $ hg revivetest 'obsolete()' --config extensions.revivetest=$TESTTMP/revivetest.py
A is revived A is revived
B is revived B is revived
D is revived D is revived
E is revived E is revived
F is revived F is revived
$ hg log -G -T '{rev} {desc} {node|short}' $ hg log -G -T '{rev} {desc} {node|short}'

tests/test-undo.t

undone to *, before commit --amend (glob) undone to *, before commit --amend (glob)
$ hg sl --all --hidden -T "{node|short} {if(undosuccessors, label('sl.undo', '(Undone as {join(undosuccessors% \'{shortest(undosuccessor, 6)}\', ', ')})'))}" $ hg sl --all --hidden -T "{node|short} {if(undosuccessors, label('sl.undo', '(Undone as {join(undosuccessors% \'{shortest(undosuccessor, 6)}\', ', ')})'))}"
x f007a7cf4c3d x f007a7cf4c3d
| |
| x aa430c8afedf | x aa430c8afedf
|/ |/
@ 1dafc0b43612 @ 1dafc0b43612
: :
: x c9476255bc2a (Undone as 1dafc0) : x c9476255bc2a (Undone as 1dafc0, 1dafc0)
:/ :/
: x 2dca609174c2 : x 2dca609174c2 (Undone as 1dafc0)
:/ :/
: o 296fda51a303 : o 296fda51a303
:/ :/
: x db92053d5c83 : x db92053d5c83
:/ :/
: o 49cdb4091aca : o 49cdb4091aca
:/ :/
o b68836a6e2ca o b68836a6e2ca
record change 1/2 to 'newa'? [Ynesfdaq?] y record change 1/2 to 'newa'? [Ynesfdaq?] y
diff --git a/newb b/newb diff --git a/newb b/newb
new file mode 100644 new file mode 100644
examine changes to 'newb'? [Ynesfdaq?] n examine changes to 'newb'? [Ynesfdaq?] n
Done splitting? [yN] y Done splitting? [yN] y
$ hg debugobsolete | tail -5 $ hg debugobsolete | tail -5
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:03 1970 +0000) {'user': 'test'} 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:03 1970 +0000) {'operation': 'amend', 'user': 'test'}
c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:04 1970 +0000) {'user': 'test'} c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:04 1970 +0000) {'operation': 'undo', 'user': 'test'}
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:05 1970 +0000) {'user': 'test'} 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:05 1970 +0000) {'operation': 'amend', 'user': 'test'}
c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:06 1970 +0000) {'operation': 'undo', 'user': 'test'} c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:06 1970 +0000) {'operation': 'undo', 'user': 'test'}
f86734247df6db66a810e549cc938a72cd5c6d1a d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'} f86734247df6db66a810e549cc938a72cd5c6d1a d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'}
$ hg undo $ hg undo
undone to *, before split --quiet (glob) undone to *, before split --quiet (glob)
$ hg undo -n -1 $ hg undo -n -1
undone to *, before undo (glob) undone to *, before undo (glob)
$ hg debugobsolete | tail -5 $ hg debugobsolete | tail -5
d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea f86734247df6db66a810e549cc938a72cd5c6d1a 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'} d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea f86734247df6db66a810e549cc938a72cd5c6d1a 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'}