| hg-reviewers |
Otherwise Python 2 will attempt to coerce unicode to str, which
we don't want.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/journal.py (4 lines) | |||
| M | mercurial/util.py (6 lines) |
| e for e in storage._open(sharedrepo.vfs, _newestfirst=False) | e for e in storage._open(sharedrepo.vfs, _newestfirst=False) | ||||
| if sharednamespaces.get(e.namespace) in sharedfeatures) | if sharednamespaces.get(e.namespace) in sharedfeatures) | ||||
| for entry in _mergeentriesiter(local, shared, order=min): | for entry in _mergeentriesiter(local, shared, order=min): | ||||
| storage._write(repo.vfs, entry) | storage._write(repo.vfs, entry) | ||||
| return orig(ui, repo, repopath) | return orig(ui, repo, repopath) | ||||
| class journalentry(collections.namedtuple( | class journalentry(collections.namedtuple( | ||||
| u'journalentry', | r'journalentry', | ||||
| u'timestamp user command namespace name oldhashes newhashes')): | r'timestamp user command namespace name oldhashes newhashes')): | ||||
| """Individual journal entry | """Individual journal entry | ||||
| * timestamp: a mercurial (time, timezone) tuple | * timestamp: a mercurial (time, timezone) tuple | ||||
| * user: the username that ran the command | * user: the username that ran the command | ||||
| * namespace: the entry namespace, an opaque string | * namespace: the entry namespace, an opaque string | ||||
| * name: the name of the changed item, opaque string with meaning in the | * name: the name of the changed item, opaque string with meaning in the | ||||
| namespace | namespace | ||||
| * command: the hg command that triggered this record | * command: the hg command that triggered this record | ||||
| yield path[:pos] | yield path[:pos] | ||||
| pos = path.rfind('/', 0, pos) | pos = path.rfind('/', 0, pos) | ||||
| # compression code | # compression code | ||||
| SERVERROLE = 'server' | SERVERROLE = 'server' | ||||
| CLIENTROLE = 'client' | CLIENTROLE = 'client' | ||||
| compewireprotosupport = collections.namedtuple(u'compenginewireprotosupport', | compewireprotosupport = collections.namedtuple(r'compenginewireprotosupport', | ||||
| (u'name', u'serverpriority', | (r'name', r'serverpriority', | ||||
| u'clientpriority')) | r'clientpriority')) | ||||
| class compressormanager(object): | class compressormanager(object): | ||||
| """Holds registrations of various compression engines. | """Holds registrations of various compression engines. | ||||
| This class essentially abstracts the differences between compression | This class essentially abstracts the differences between compression | ||||
| engines to allow new compression formats to be added easily, possibly from | engines to allow new compression formats to be added easily, possibly from | ||||
| extensions. | extensions. | ||||