Mercurial > hg
view tests/test-hgwebdir-paths.py @ 38667:572dff5c946e
rebase: add --confirm option
This feature adds a functionality in rebase to confirm before applying
changes.
When there is no conflict and user confirm to apply actions, we just
finish the unfinished rebase. But when there is a conflict and user
confirm to apply actions then we can't just finish rebasing using
rbsrt._finishrebase() because in-memory merge doesn't support conflicts, so
we have to abort and run on-disk merge in this case.
And if user doesn't confirm to apply actions then simply abort the rebase.
Differential Revision: https://phab.mercurial-scm.org/D3870
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 30 Jun 2018 12:42:49 +0530 |
parents | 81455f482478 |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import absolute_import import os from mercurial import ( hg, ui as uimod, ) from mercurial.hgweb import ( hgwebdir_mod, ) hgwebdir = hgwebdir_mod.hgwebdir os.mkdir(b'webdir') os.chdir(b'webdir') webdir = os.path.realpath(b'.') u = uimod.ui.load() hg.repository(u, b'a', create=1) hg.repository(u, b'b', create=1) os.chdir(b'b') hg.repository(u, b'd', create=1) os.chdir(b'..') hg.repository(u, b'c', create=1) os.chdir(b'..') paths = {b't/a/': b'%s/a' % webdir, b'b': b'%s/b' % webdir, b'coll': b'%s/*' % webdir, b'rcoll': b'%s/**' % webdir} config = os.path.join(webdir, b'hgwebdir.conf') configfile = open(config, 'wb') configfile.write(b'[paths]\n') for k, v in paths.items(): configfile.write(b'%s = %s\n' % (k, v)) configfile.close() confwd = hgwebdir(config) dictwd = hgwebdir(paths) assert len(confwd.repos) == len(dictwd.repos), 'different numbers' assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos) found = dict(confwd.repos) for key, path in dictwd.repos: assert key in found, 'repository %s was not found' % key assert found[key] == path, 'different paths for repo %s' % key