Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-trusted.py.out @ 5192:33015dac5df5
convert: fix mercurial_sink.putcommit
Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a
revision that touches no files, but this can break regular conversions
from some repositories:
- conceptually, since we're converting a repo, we should try to make
the new hg repo as similar as possible to the original repo - we
should create a new changeset, even if the original revision didn't
touch any files (maybe the commit message had some important bit);
- even if a "regular" revision that doesn't touch any file may seem
weird (and maybe even broken), it's completely legitimate for a merge
revision to not touch any file, and, if we just skip it, the
converted repo will end up with wrong history and possibly an extra
head.
As an example, say the crew and main hg repos are sync'ed. Somebody
sends an important patch to the mailing list. Matt quickly applies
and pushes it. But at the same time somebody also applies it to crew
and pushes it. Suppose the commit message ended up being a bit
different (say, there was a typo and somebody didn't fix it) or that
the date ended up being different (because of different patch-applying
scripts): the changeset hashes will be different, but the manifests
will be the same.
Since both changesets were pushed to public repos, it's hard to recall
them. If both are merged, the manifest from the resulting merge
revision will have the exact same contents as its parents - i.e. the
merge revision really doesn't touch any file at all.
To keep the file filtering stuff "working", the generic code was changed
to skip empty revisions if we're filtering the repo, fixing a bug in the
process (we want parents[0] instead of tip).
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 17 Aug 2007 20:18:05 -0300 |
parents | 9b52239dc740 |
children |
line wrap: on
line source
# same user, same group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # same user, different group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # different user, same group Not trusting file .hg/hgrc from untrusted user abc, group bar trusted global = /some/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # different user, same group, but we trust the group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # different user, different group Not trusting file .hg/hgrc from untrusted user abc, group def trusted global = /some/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # different user, different group, but we trust the user trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # different user, different group, but we trust the group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # different user, different group, but we trust the user and the group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # we trust all users # different user, different group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # we trust all groups # different user, different group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # we trust all users and groups # different user, different group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # we don't get confused by users and groups with the same name # different user, different group Not trusting file .hg/hgrc from untrusted user abc, group def trusted global = /some/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # list of user names # different user, different group, but we trust the user trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # list of group names # different user, different group, but we trust the group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # Can't figure out the name of the user running this process # different user, different group trusted global = /some/path interpolated = /some/path/another/path local = /another/path untrusted . . global = /some/path . . interpolated = /some/path/another/path . . local = /another/path # prints debug warnings # different user, different group Not trusting file .hg/hgrc from untrusted user abc, group def trusted Ignoring untrusted configuration option paths.interpolated = /some/path/another/path Ignoring untrusted configuration option paths.local = /another/path global = /some/path untrusted . . global = /some/path .Ignoring untrusted configuration option paths.interpolated = /some/path/another/path . interpolated = /some/path/another/path .Ignoring untrusted configuration option paths.local = /another/path . local = /another/path # ui.readsections quux # read trusted, untrusted, new ui, trusted Not trusting file foobar from untrusted user abc, group def trusted: Ignoring untrusted configuration option foobar.baz = quux None /some/path/another/path untrusted: quux /some/path/another/path # error handling # file doesn't exist # same user, same group # different user, different group # parse error # different user, different group Not trusting file .hg/hgrc from untrusted user abc, group def Ignored: Failed to parse .hg/hgrc File contains no section headers. file: .hg/hgrc, line: 1 'foo = bar' # same user, same group raised Abort # interpolation error # same user, same group # regular config: trusted raised Abort untrusted raised Abort # different user, different group Not trusting file .hg/hgrc from untrusted user abc, group def trusted Ignored: Error in configuration section [foo] parameter 'bar': bad interpolation variable reference '%(' None untrusted raised Abort # configitems: trusted Ignored: Error in configuration section [foo]: bad interpolation variable reference '%(' [] untrusted raised Abort