This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9721

convert: option to set date and time for svn commits
ClosedPublic

Authored by nslsrv on Jan 11 2021, 5:55 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7525e77b5eac: convert: option to set date and time for svn commits
rHG11bf514e0279: convert: option to set date and time for svn commits
Summary

Converting to subversion repository is not preserving original commit dates as
it may break some subversion functionality if commit dates are not monotonically
increasing.

This patch adds convert.svn.dangerous-set-commit-dates configuration option
to change this behaviour and enable commit dates convertion for those who want
to take risks.

Subversion always uses commit dates with UTC timezone, so only timestamps
are used.

Test test-convert-svn-sink.t uses svnxml.py script to dump history of svn
repositories. Atm the script is not printing date field from svn log. This
patch changes this to allow checks on correctness of date and time convertion.

Documentation is updated. Additional test case is added to test commit dates
convertion.

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

nslsrv created this revision.Jan 11 2021, 5:55 PM
nslsrv planned changes to this revision.Jan 11 2021, 6:33 PM

Just noticed that incremental conversion is not covered by the patch.

hgext/convert/subversion.py
1505

I guess it's wrong for incremental conversion: it must be initialized with the last svn commit date, if destination svn repository is not empty.

durin42 added a subscriber: durin42.Jan 11 2021, 7:11 PM
durin42 added inline comments.
hgext/convert/__init__.py
501

I'd rather this had a scarier name, like allow-setting-dates-i-understand-this-can-break-some-svn-behavior-and-read-the-docs. Also, modern convention these days is to separate words with dashes in config knobs to make them easier to read. :)

504

Extra caveats are required here, notably that per http://svnbook.red-bean.com/en/1.7/svn.ref.reposhooks.pre-revprop-change.html if the pre-revprop-change hook is absent (the default) on the server then this option must remain disabled.

nslsrv added inline comments.Jan 11 2021, 8:07 PM
hgext/convert/__init__.py
504

If there's no pre-revprop-change hook than propsetting would fail completely, not only for svn:date, but also for hg:convert-rev and hg:convert-branch. It would work as a natural barrier, since propset retcodes are not checked.

The setting being proposed here is not for enabling propsetting itself, but rather for controlling its behavior making it "safe" or "non-safe".

By now I assume that monotonically increasing dates is a good default if propsetting itself is allowed on the server. Do you think that it's better to have propsetting disabled by default?

I'm preparing the patch that checks the last revision date, which makes the code even more complex. Maybe it's time to shift back to simplier solution and make an option to just enable/disable date propsetting itself.

durin42 added inline comments.Jan 12 2021, 10:37 AM
hgext/convert/__init__.py
504

I don't know that I'd bother with the more complicated version. I do think it makes sense to have the date-propsetting off by default (the hg:whatever ones are fine - they're harmless).

Good catch on this failing-working if propsets fail. I guess that's by design. Probably still should document the svn-date-editing thing requiring the hook because otherwise that's a mysterious bug report in 3y waiting to happen IMO.

nslsrv retitled this revision from convert: set date and time for svn commits to convert: option to set date and time for svn commits.Jan 12 2021, 4:20 PM
nslsrv edited the summary of this revision. (Show Details)
nslsrv updated this revision to Diff 24722.
nslsrv marked 3 inline comments as done.Jan 12 2021, 4:24 PM

I decided to simplify things and made an option to enable/disable date setting altogether. I've addressed the comments about option naming, documented the need for pre-revprop-change hook modification and made the hook generation more flexible for local repo case.

nslsrv added a comment.Jan 19 2021, 1:38 PM

@durin42 Should I ask you or anybody else to review? No problem with waiting, just not sure.

durin42 added a comment.Jan 19 2021, 2:12 PM

Ping someone else please - I'm busy with other things this week. :(

pulkit accepted this revision.Jan 27 2021, 5:31 AM
This revision is now accepted and ready to land.Jan 27 2021, 5:31 AM
nslsrv added a commit: rHG11bf514e0279: convert: option to set date and time for svn commits.Jan 27 2021, 8:14 AM
Closed by commit rHG11bf514e0279: convert: option to set date and time for svn commits (authored by nslsrv). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25301

hgext/convert/__init__.py

All Destinations All Destinations
################ ################
All destination types accept the following options: All destination types accept the following options:
:convert.skiptags: does not convert tags from the source repo to the target :convert.skiptags: does not convert tags from the source repo to the target
repo. The default is False. repo. The default is False.
Subversion Destination
######################
Original commit dates are not preserved by default.
:convert.svn.dangerous-set-commit-dates: preserve original commit dates,
forcefully setting ``svn:date`` revision properties. This option is
durin42Unsubmitted
Done

I'd rather this had a scarier name, like allow-setting-dates-i-understand-this-can-break-some-svn-behavior-and-read-the-docs. Also, modern convention these days is to separate words with dashes in config knobs to make them easier to read. :)

durin42: I'd rather this had a scarier name, like `allow-setting-dates-i-understand-this-can-break-some…
DANGEROUS and may break some subversion functionality for the resulting
repository (e.g. filtering revisions with date ranges in ``svn log``),
as original commit dates are not guaranteed to be monotonically
durin42Unsubmitted
Done

Extra caveats are required here, notably that per http://svnbook.red-bean.com/en/1.7/svn.ref.reposhooks.pre-revprop-change.html if the pre-revprop-change hook is absent (the default) on the server then this option must remain disabled.

durin42: Extra caveats are required here, notably that per http://svnbook.red-bean.com/en/1.7/svn.ref.
nslsrvAuthorUnsubmitted
Done

If there's no pre-revprop-change hook than propsetting would fail completely, not only for svn:date, but also for hg:convert-rev and hg:convert-branch. It would work as a natural barrier, since propset retcodes are not checked.

The setting being proposed here is not for enabling propsetting itself, but rather for controlling its behavior making it "safe" or "non-safe".

By now I assume that monotonically increasing dates is a good default if propsetting itself is allowed on the server. Do you think that it's better to have propsetting disabled by default?

I'm preparing the patch that checks the last revision date, which makes the code even more complex. Maybe it's time to shift back to simplier solution and make an option to just enable/disable date propsetting itself.

nslsrv: If there's no pre-revprop-change hook than propsetting would fail completely, not only for svn…
durin42Unsubmitted
Done

I don't know that I'd bother with the more complicated version. I do think it makes sense to have the date-propsetting off by default (the hg:whatever ones are fine - they're harmless).

Good catch on this failing-working if propsets fail. I guess that's by design. Probably still should document the svn-date-editing thing requiring the hook because otherwise that's a mysterious bug report in 3y waiting to happen IMO.

durin42: I don't know that I'd bother with the more complicated version. I do think it makes sense to…
increasing.
For commit dates setting to work destination repository must have
``pre-revprop-change`` hook configured to allow setting of ``svn:date``
revision properties. See Subversion documentation for more details.
""" """
return convcmd.convert(ui, src, dest, revmapfile, **opts) return convcmd.convert(ui, src, dest, revmapfile, **opts)
@command(b'debugsvnlog', [], b'hg debugsvnlog', norepo=True) @command(b'debugsvnlog', [], b'hg debugsvnlog', norepo=True)
def debugsvnlog(ui, **opts): def debugsvnlog(ui, **opts):
return subversion.debugsvnlog(ui, **opts) return subversion.debugsvnlog(ui, **opts)

hgext/convert/subversion.py

def fs2svn(s): def fs2svn(s):
if fsencoding_is_utf8: if fsencoding_is_utf8:
return s return s
else: else:
return s.decode(fsencoding).encode('utf-8') return s.decode(fsencoding).encode('utf-8')
def formatsvndate(date):
return dateutil.datestr(date, b'%Y-%m-%dT%H:%M:%S.000000Z')
def parsesvndate(s):
# Example SVN datetime. Includes microseconds.
# ISO-8601 conformant
# '2007-01-04T17:35:00.902377Z'
return dateutil.parsedate(s[:19] + b' UTC', [b'%Y-%m-%dT%H:%M:%S'])
class SvnPathNotFound(Exception): class SvnPathNotFound(Exception):
pass pass
def revsplit(rev): def revsplit(rev):
"""Parse a revision string and return (uuid, path, revnum). """Parse a revision string and return (uuid, path, revnum).
>>> revsplit(b'svn:a2147622-4a9f-4db4-a8d3-13562ff547b2' >>> revsplit(b'svn:a2147622-4a9f-4db4-a8d3-13562ff547b2'
... b'/proj%20B/mytrunk/mytrunk@1') ... b'/proj%20B/mytrunk/mytrunk@1')
paths = [] paths = []
# filter out unrelated paths # filter out unrelated paths
for path, ent in orig_paths: for path, ent in orig_paths:
if self.getrelpath(path) is None: if self.getrelpath(path) is None:
continue continue
paths.append((path, ent)) paths.append((path, ent))
# Example SVN datetime. Includes microseconds. date = parsesvndate(date)
# ISO-8601 conformant
# '2007-01-04T17:35:00.902377Z'
date = dateutil.parsedate(
date[:19] + b" UTC", [b"%Y-%m-%dT%H:%M:%S"]
)
if self.ui.configbool(b'convert', b'localtimezone'): if self.ui.configbool(b'convert', b'localtimezone'):
date = makedatetimestamp(date[0]) date = makedatetimestamp(date[0])
if message: if message:
log = self.recode(message) log = self.recode(message)
else: else:
log = b'' log = b''
_( _(
b'Mercurial failed to run itself, check' b'Mercurial failed to run itself, check'
b' hg executable is in PATH' b' hg executable is in PATH'
) )
) )
return logstream(stdout) return logstream(stdout)
pre_revprop_change = b'''#!/bin/sh pre_revprop_change_template = b'''#!/bin/sh
REPOS="$1" REPOS="$1"
REV="$2" REV="$2"
USER="$3" USER="$3"
PROPNAME="$4" PROPNAME="$4"
ACTION="$5" ACTION="$5"
if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi %(rules)s
if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi
if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi
echo "Changing prohibited revision property" >&2 echo "Changing prohibited revision property" >&2
exit 1 exit 1
''' '''
def gen_pre_revprop_change_hook(prop_actions_allowed):
rules = []
for action, propname in prop_actions_allowed:
rules.append((b'if [ "$ACTION" = "%s" -a "$PROPNAME" = "%s" ]; '
b'then exit 0; fi') % (action, propname))
return pre_revprop_change_template % {b'rules': b'\n'.join(rules)}
class svn_sink(converter_sink, commandline): class svn_sink(converter_sink, commandline):
commit_re = re.compile(br'Committed revision (\d+).', re.M) commit_re = re.compile(br'Committed revision (\d+).', re.M)
uuid_re = re.compile(br'Repository UUID:\s*(\S+)', re.M) uuid_re = re.compile(br'Repository UUID:\s*(\S+)', re.M)
def prerun(self): def prerun(self):
if self.wc: if self.wc:
os.chdir(self.wc) os.chdir(self.wc)
self.wopener = vfsmod.vfs(self.wc) self.wopener = vfsmod.vfs(self.wc)
self.childmap = mapfile(ui, self.join(b'hg-childmap')) self.childmap = mapfile(ui, self.join(b'hg-childmap'))
if util.checkexec(self.wc): if util.checkexec(self.wc):
self.is_exec = util.isexec self.is_exec = util.isexec
else: else:
self.is_exec = None self.is_exec = None
if created: if created:
prop_actions_allowed = [
(b'M', b'svn:log'),
(b'A', b'hg:convert-branch'),
(b'A', b'hg:convert-rev'),
]
if self.ui.configbool(b'convert', b'svn.dangerous-set-commit-dates'):
prop_actions_allowed.append((b'M', b'svn:date'))
hook = os.path.join(created, b'hooks', b'pre-revprop-change') hook = os.path.join(created, b'hooks', b'pre-revprop-change')
fp = open(hook, b'wb') fp = open(hook, b'wb')
fp.write(pre_revprop_change) fp.write(gen_pre_revprop_change_hook(prop_actions_allowed))
fp.close() fp.close()
util.setflags(hook, False, True) util.setflags(hook, False, True)
output = self.run0(b'info') output = self.run0(b'info')
self.uuid = self.uuid_re.search(output).group(1).strip() self.uuid = self.uuid_re.search(output).group(1).strip()
def wjoin(self, *names): def wjoin(self, *names):
return os.path.join(self.wc, *names) return os.path.join(self.wc, *names)
nslsrvAuthorUnsubmitted
Done

I guess it's wrong for incremental conversion: it must be initialized with the last svn commit date, if destination svn repository is not empty.

nslsrv: I guess it's wrong for incremental conversion: it must be initialized with the last svn commit…
@propertycache @propertycache
def manifest(self): def manifest(self):
# As of svn 1.7, the "add" command fails when receiving # As of svn 1.7, the "add" command fails when receiving
# already tracked entries, so we have to track and filter them # already tracked entries, so we have to track and filter them
# ourselves. # ourselves.
m = set() m = set()
output = self.run0(b'ls', recursive=True, xml=True) output = self.run0(b'ls', recursive=True, xml=True)
doc = xml.dom.minidom.parseString(output) doc = xml.dom.minidom.parseString(output)
if commit.branch and commit.branch != b'default': if commit.branch and commit.branch != b'default':
self.run( self.run(
b'propset', b'propset',
b'hg:convert-branch', b'hg:convert-branch',
commit.branch, commit.branch,
revprop=True, revprop=True,
revision=rev, revision=rev,
) )
if self.ui.configbool(b'convert', b'svn.dangerous-set-commit-dates'):
# Subverson always uses UTC to represent date and time
date = dateutil.parsedate(commit.date)
date = (date[0], 0)
# The only way to set date and time for svn commit is to use propset after commit is done
self.run(
b'propset',
b'svn:date',
formatsvndate(date),
revprop=True,
revision=rev,
)
for parent in parents: for parent in parents:
self.addchild(parent, rev) self.addchild(parent, rev)
return self.revid(rev) return self.revid(rev)
finally: finally:
os.unlink(messagefile) os.unlink(messagefile)
def puttags(self, tags): def puttags(self, tags):
self.ui.warn(_(b'writing Subversion tags is not yet implemented\n')) self.ui.warn(_(b'writing Subversion tags is not yet implemented\n'))

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem( coreconfigitem(
b'convert', b'convert',
b'svn.startrev', b'svn.startrev',
default=0, default=0,
) )
coreconfigitem( coreconfigitem(
b'convert',
b'svn.dangerous-set-commit-dates',
default=False,
)
coreconfigitem(
b'debug', b'debug',
b'dirstate.delaywrite', b'dirstate.delaywrite',
default=0, default=0,
) )
coreconfigitem( coreconfigitem(
b'defaults', b'defaults',
b'.*', b'.*',
default=None, default=None,

tests/svnxml.py

return ''.join(c.data for c in e.childNodes if c.nodeType == c.TEXT_NODE) return ''.join(c.data for c in e.childNodes if c.nodeType == c.TEXT_NODE)
def parseentry(entry): def parseentry(entry):
e = {} e = {}
e['revision'] = entry.getAttribute('revision') e['revision'] = entry.getAttribute('revision')
e['author'] = xmltext(entry.getElementsByTagName('author')[0]) e['author'] = xmltext(entry.getElementsByTagName('author')[0])
e['msg'] = xmltext(entry.getElementsByTagName('msg')[0]) e['msg'] = xmltext(entry.getElementsByTagName('msg')[0])
e['date'] = xmltext(entry.getElementsByTagName('date')[0])
e['paths'] = [] e['paths'] = []
paths = entry.getElementsByTagName('paths') paths = entry.getElementsByTagName('paths')
if paths: if paths:
paths = paths[0] paths = paths[0]
for p in paths.getElementsByTagName('path'): for p in paths.getElementsByTagName('path'):
action = p.getAttribute('action').encode('utf-8') action = p.getAttribute('action').encode('utf-8')
path = xmltext(p).encode('utf-8') path = xmltext(p).encode('utf-8')
frompath = p.getAttribute('copyfrom-path').encode('utf-8') frompath = p.getAttribute('copyfrom-path').encode('utf-8')
def printentries(entries): def printentries(entries):
try: try:
fp = sys.stdout.buffer fp = sys.stdout.buffer
except AttributeError: except AttributeError:
fp = sys.stdout fp = sys.stdout
for e in entries: for e in entries:
for k in ('revision', 'author', 'msg'): for k in ('revision', 'author', 'date', 'msg'):
fp.write(('%s: %s\n' % (k, e[k])).encode('utf-8')) fp.write(('%s: %s\n' % (k, e[k])).encode('utf-8'))
for path, action, fpath, frev in sorted(e['paths']): for path, action, fpath, frev in sorted(e['paths']):
frominfo = b'' frominfo = b''
if frev: if frev:
frominfo = b' (from %s@%s)' % (fpath, frev) frominfo = b' (from %s@%s)' % (fpath, frev)
p = b' %s %s%s\n' % (action, path, frominfo) p = b' %s %s%s\n' % (action, path, frominfo)
fp.write(p) fp.write(p)
if __name__ == '__main__': if __name__ == '__main__':
data = sys.stdin.read() data = sys.stdin.read()
entries = parselog(data) entries = parselog(data)
printentries(entries) printentries(entries)

tests/test-convert-svn-sink.t

$ svnupanddisplay a-hg-wc 2 $ svnupanddisplay a-hg-wc 2
2 1 test d1 2 1 test d1
2 1 test d1/d2 2 1 test d1/d2
2 1 test d1/d2/b 2 1 test d1/d2/b
2 2 test . 2 2 test .
2 2 test a 2 2 test a
revision: 2 revision: 2
author: test author: test
date: * (glob)
msg: modify a file msg: modify a file
M /a M /a
revision: 1 revision: 1
author: test author: test
date: * (glob)
msg: add a file msg: add a file
A /a A /a
A /d1 A /d1
A /d1/d2 A /d1/d2
A /d1/d2/b A /d1/d2/b
$ ls a a-hg-wc $ ls a a-hg-wc
a: a:
a a
$ svnupanddisplay a-hg-wc 1 $ svnupanddisplay a-hg-wc 1
3 1 test d1 3 1 test d1
3 1 test d1/d2 3 1 test d1/d2
3 1 test d1/d2/b 3 1 test d1/d2/b
3 3 test . 3 3 test .
3 3 test b 3 3 test b
revision: 3 revision: 3
author: test author: test
date: * (glob)
msg: rename a file msg: rename a file
D /a D /a
A /b (from /a@2) A /b (from /a@2)
$ ls a a-hg-wc $ ls a a-hg-wc
a: a:
b b
d1 d1
4 1 test d1 4 1 test d1
4 1 test d1/d2 4 1 test d1/d2
4 1 test d1/d2/b 4 1 test d1/d2/b
4 3 test b 4 3 test b
4 4 test . 4 4 test .
4 4 test c 4 4 test c
revision: 4 revision: 4
author: test author: test
date: * (glob)
msg: copy a file msg: copy a file
A /c (from /b@3) A /c (from /b@3)
$ ls a a-hg-wc $ ls a a-hg-wc
a: a:
b b
c c
d1 d1
$ svnupanddisplay a-hg-wc 1 $ svnupanddisplay a-hg-wc 1
5 1 test d1 5 1 test d1
5 1 test d1/d2 5 1 test d1/d2
5 1 test d1/d2/b 5 1 test d1/d2/b
5 4 test c 5 4 test c
5 5 test . 5 5 test .
revision: 5 revision: 5
author: test author: test
date: * (glob)
msg: remove a file msg: remove a file
D /b D /b
$ ls a a-hg-wc $ ls a a-hg-wc
a: a:
c c
d1 d1
a-hg-wc: a-hg-wc:
$ svnupanddisplay a-hg-wc 1 $ svnupanddisplay a-hg-wc 1
6 1 test d1 6 1 test d1
6 1 test d1/d2 6 1 test d1/d2
6 1 test d1/d2/b 6 1 test d1/d2/b
6 6 test . 6 6 test .
6 6 test c 6 6 test c
revision: 6 revision: 6
author: test author: test
date: * (glob)
msg: make a file executable msg: make a file executable
M /c M /c
#if execbit #if execbit
$ test -x a-hg-wc/c $ test -x a-hg-wc/c
#endif #endif
#if symlink #if symlink
8 1 test d1 8 1 test d1
8 1 test d1/d2 8 1 test d1/d2
8 1 test d1/d2/b 8 1 test d1/d2/b
8 6 test c 8 6 test c
8 8 test . 8 8 test .
8 8 test newlink 8 8 test newlink
revision: 8 revision: 8
author: test author: test
date: * (glob)
msg: move symlink msg: move symlink
D /link D /link
A /newlink (from /link@7) A /newlink (from /link@7)
Make sure our changes don't affect the rest of the test cases Make sure our changes don't affect the rest of the test cases
$ hg --cwd a up 5 $ hg --cwd a up 5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
converting... converting...
0 f 0 f
$ svnupanddisplay a-hg-wc 1 $ svnupanddisplay a-hg-wc 1
7 7 test . 7 7 test .
7 7 test d 7 7 test d
7 7 test f 7 7 test f
revision: 7 revision: 7
author: test author: test
date: * (glob)
msg: f msg: f
D /c D /c
A /d A /d
D /d1 D /d1
A /f A /f
$ rm -rf a a-hg a-hg-wc $ rm -rf a a-hg a-hg-wc
converting... converting...
0 add executable file in new directory 0 add executable file in new directory
$ svnupanddisplay a-hg-wc 1 $ svnupanddisplay a-hg-wc 1
1 1 test . 1 1 test .
1 1 test d1 1 1 test d1
1 1 test d1/a 1 1 test d1/a
revision: 1 revision: 1
author: test author: test
date: * (glob)
msg: add executable file in new directory msg: add executable file in new directory
A /d1 A /d1
A /d1/a A /d1/a
#if execbit #if execbit
$ test -x a-hg-wc/d1/a $ test -x a-hg-wc/d1/a
#endif #endif
Copy to new directory Copy to new directory
$ svnupanddisplay a-hg-wc 1 $ svnupanddisplay a-hg-wc 1
2 1 test d1 2 1 test d1
2 1 test d1/a 2 1 test d1/a
2 2 test . 2 2 test .
2 2 test d2 2 2 test d2
2 2 test d2/a 2 2 test d2/a
revision: 2 revision: 2
author: test author: test
date: * (glob)
msg: copy file to new directory msg: copy file to new directory
A /d2 A /d2
A /d2/a (from /d1/a@1) A /d2/a (from /d1/a@1)
Branchy history Branchy history
$ hg init b $ hg init b
$ echo base > b/b $ echo base > b/b
4 2 test left-1 4 2 test left-1
4 3 test b 4 3 test b
4 3 test left-2 4 3 test left-2
4 4 test . 4 4 test .
4 4 test right-1 4 4 test right-1
4 4 test right-2 4 4 test right-2
revision: 4 revision: 4
author: test author: test
date: * (glob)
msg: merge msg: merge
A /right-1 A /right-1
A /right-2 A /right-2
revision: 3 revision: 3
author: test author: test
date: * (glob)
msg: left-2 msg: left-2
M /b M /b
A /left-2 A /left-2
revision: 2 revision: 2
author: test author: test
date: * (glob)
msg: left-1 msg: left-1
M /b M /b
A /left-1 A /left-1
revision: 1 revision: 1
author: test author: test
date: * (glob)
msg: base msg: base
A /b A /b
Tags are not supported, but must not break conversion Tags are not supported, but must not break conversion
$ rm -rf a a-hg a-hg-wc $ rm -rf a a-hg a-hg-wc
$ hg init a $ hg init a
$ echo a > a/a $ echo a > a/a
0 Tagged as v1.0 0 Tagged as v1.0
writing Subversion tags is not yet implemented writing Subversion tags is not yet implemented
$ svnupanddisplay a-hg-wc 2 $ svnupanddisplay a-hg-wc 2
2 1 test a 2 1 test a
2 2 test . 2 2 test .
2 2 test .hgtags 2 2 test .hgtags
revision: 2 revision: 2
author: test author: test
date: * (glob)
msg: Tagged as v1.0 msg: Tagged as v1.0
A /.hgtags A /.hgtags
revision: 1 revision: 1
author: test author: test
date: * (glob)
msg: Add file a msg: Add file a
A /a A /a
$ rm -rf a a-hg a-hg-wc $ rm -rf a a-hg a-hg-wc
#if execbit #if execbit
Executable bit removal Executable bit removal
converting... converting...
1 create executable 1 create executable
0 remove executable bit 0 remove executable bit
$ svnupanddisplay a-hg-wc 0 $ svnupanddisplay a-hg-wc 0
2 2 test . 2 2 test .
2 2 test exec 2 2 test exec
revision: 2 revision: 2
author: test author: test
date: * (glob)
msg: remove executable bit msg: remove executable bit
M /exec M /exec
revision: 1 revision: 1
author: test author: test
date: * (glob)
msg: create executable msg: create executable
A /exec A /exec
$ test ! -x a-hg-wc/exec $ test ! -x a-hg-wc/exec
$ rm -rf a a-hg a-hg-wc $ rm -rf a a-hg a-hg-wc
#endif #endif
0 Another change 0 Another change
$ svnupanddisplay a-hg-wc 0 $ svnupanddisplay a-hg-wc 0
2 1 test a 2 1 test a
2 2 test . 2 2 test .
2 2 test b 2 2 test b
revision: 2 revision: 2
author: test author: test
date: * (glob)
msg: Another change msg: Another change
A /b A /b
revision: 1 revision: 1
author: test author: test
date: * (glob)
msg: Some change msg: Some change
A /a A /a
$ rm -rf a a-hg a-hg-wc $ rm -rf a a-hg a-hg-wc
Commit dates convertion
$ hg init a
$ echo a >> a/a
$ hg add a
adding a/a
$ hg --cwd a ci -d '1 0' -A -m 'Change 1'
$ echo a >> a/a
$ hg --cwd a ci -d '2 0' -m 'Change 2'
$ echo a >> a/a
$ hg --cwd a ci -d '2 0' -m 'Change at the same time'
$ echo a >> a/a
$ hg --cwd a ci -d '1 0' -m 'Change in the past'
$ echo a >> a/a
$ hg --cwd a ci -d '3 0' -m 'Change in the future'
$ hg convert --config convert.svn.dangerous-set-commit-dates=true -d svn a
assuming destination a-hg
initializing svn repository 'a-hg'
initializing svn working copy 'a-hg-wc'
scanning source...
sorting...
converting...
4 Change 1
3 Change 2
2 Change at the same time
1 Change in the past
0 Change in the future
$ svnupanddisplay a-hg-wc 0
5 5 test .
5 5 test a
revision: 5
author: test
date: 1970-01-01T00:00:03.000000Z
msg: Change in the future
M /a
revision: 4
author: test
date: 1970-01-01T00:00:01.000000Z
msg: Change in the past
M /a
revision: 3
author: test
date: 1970-01-01T00:00:02.000000Z
msg: Change at the same time
M /a
revision: 2
author: test
date: 1970-01-01T00:00:02.000000Z
msg: Change 2
M /a
revision: 1
author: test
date: 1970-01-01T00:00:01.000000Z
msg: Change 1
A /a
$ rm -rf a a-hg a-hg-wc

tests/test-convert.t

################ ################
All destination types accept the following options: All destination types accept the following options:
convert.skiptags convert.skiptags
does not convert tags from the source repo to the target does not convert tags from the source repo to the target
repo. The default is False. repo. The default is False.
Subversion Destination
######################
Original commit dates are not preserved by default.
convert.svn.dangerous-set-commit-dates
preserve original commit dates, forcefully setting
"svn:date" revision properties. This option is DANGEROUS and
may break some subversion functionality for the resulting
repository (e.g. filtering revisions with date ranges in
"svn log"), as original commit dates are not guaranteed to
be monotonically increasing.
For commit dates setting to work destination repository must have "pre-
revprop-change" hook configured to allow setting of "svn:date" revision
properties. See Subversion documentation for more details.
options ([+] can be repeated): options ([+] can be repeated):
-s --source-type TYPE source repository type -s --source-type TYPE source repository type
-d --dest-type TYPE destination repository type -d --dest-type TYPE destination repository type
-r --rev REV [+] import up to source revision REV -r --rev REV [+] import up to source revision REV
-A --authormap FILE remap usernames using this file -A --authormap FILE remap usernames using this file
--filemap FILE remap file names using contents of file --filemap FILE remap file names using contents of file
--full apply filemap changes by converting all files again --full apply filemap changes by converting all files again