This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4883

tests: add test to demonstrate issue5783
ClosedPublic

Authored by Zharaskhan on Oct 4 2018, 7:03 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa4d62ff9a86d: obsolete: fix ValueError when stored note contains ':' char (issue5783)
Summary

Next patch will fix the bug

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

Zharaskhan created this revision.Oct 4 2018, 7:03 PM
pulkit accepted this revision.Oct 4 2018, 7:18 PM
Closed by commit rHGa4d62ff9a86d: obsolete: fix ValueError when stored note contains ':' char (issue5783) (authored by Zharaskhan). · Explain WhyOct 5 2018, 9:26 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Oct 5 2018, 9:28 PM

Queued, thanks. I've folded this into the fix since the traceback message
is pretty much environment dependent.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsolete.py (2 lines)
Mtests/test-obsolete.t (19 lines)

Diff 11733

mercurial/obsolete.py

raise ValueError("':' is forbidden in metadata value'") raise ValueError("':' is forbidden in metadata value'")
return '\0'.join(['%s:%s' % (k, meta[k]) for k in sorted(meta)]) return '\0'.join(['%s:%s' % (k, meta[k]) for k in sorted(meta)])
def _fm0decodemeta(data): def _fm0decodemeta(data):
"""Return string to string dictionary from encoded version.""" """Return string to string dictionary from encoded version."""
d = {} d = {}
for l in data.split('\0'): for l in data.split('\0'):
if l: if l:
key, value = l.split(':') key, value = l.split(':', 1)
d[key] = value d[key] = value
return d return d
## Parsing and writing of version "1" ## Parsing and writing of version "1"
# #
# The header is followed by the markers. Each marker is made of: # The header is followed by the markers. Each marker is made of:
# #
# - uint32: total size of the marker (including this field) # - uint32: total size of the marker (including this field)

tests/test-obsolete.t

o 3:d27fb9b06607 (draft) [ ] bb o 3:d27fb9b06607 (draft) [ ] bb
| |
| o 2:6fdef60fcbab (draft) [ ] b | o 2:6fdef60fcbab (draft) [ ] b
|/ |/
o 1:f9bd49731b0b (draft) [ ] aa o 1:f9bd49731b0b (draft) [ ] aa
$ cd .. $ cd ..
Test issue 5783
$ hg init issue-5783 --config format.obsstore-version=0
$ cd issue-5783
$ touch a.cpp
$ hg add a.cpp
$ hg commit -m 'Add a.cpp'
$ echo 'Hello' > a.cpp
$ hg amend -n 'Testing::Obsstore' --config format.obsstore-version=0 --config extensions.amend=
$ touch b.cpp
$ hg add b.cpp
$ hg commit -m 'Add b.cpp'
$ echo 'Hello' > b.cpp
$ hg amend -n 'Testing::Obsstore2' --config extensions.amend=
$ hg debugobsolete
d1b09fe3ad2b2a03e23a72f0c582e29a49570145 1a1a11184d2588af24e767e5335d5d9d07e8c550 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore', 'operation': 'amend', 'user': 'test'}
1bfd8e3868f641e048b6667cd672c68932f26d00 79959ca316d5b27ac6be1dd0cfd0843a5b5412eb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore2', 'operation': 'amend', 'user': 'test'}
$ cd ..